subcomments
merge
Merge branch 'master' of https://github.com/CMPUT301W14T11/Team11Prototype

Conflicts:
	libproject/google-play-services_lib/bin/google-play-services_lib.jar
Merge branch 'master' of https://github.com/CMPUT301W14T11/Team11Prototype