Spiral 4
commit
Merge branch 'master' of
https://github.com/VictorChenLi/BatonStudentAndroid.git

Conflicts:
	AndroidManifest.xml
	src/ca/utoronto/ece1778/baton/screens/JoinActivity.java
	src/ca/utoronto/ece1778/baton/screens/MainScreenActivity.java
	src/ca/utoronto/ece1778/baton/syncserver/BatonServerCommunicator.java