build server
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client/.idea/gradle.xml
	Client/Client.iml
	Client/app/app.iml