Merge branch 'feature_client'
authorEddie <dev@fun2be.me>
Tue, 2 Jun 2015 16:16:08 +0000 (17:16 +0100)
committerEddie <dev@fun2be.me>
Tue, 2 Jun 2015 16:16:08 +0000 (17:16 +0100)

Trivial merge