minor changes in ClientWelcome
Merge branch 'master' of https://github.com/drorcohe/finalPostPCProject
Merge branch 'master' of https://github.com/drorcohe/finalPostPCProject
FETCH MY SON. FETCH!
Merge branch 'master' of https://github.com/drorcohe/finalPostPCProject

Conflicts:
	MapSample/AndroidManifest.xml