com with server, user login
Merge commit '6148b9a6d1ee0ab0bb3b9d0a45a919d0ffe10382'

Conflicts:
	KidZone.Client/App/MainStoryboard_iPad.storyboard