Merge remote-tracking branch 'origin/master'

Conflicts:
	Study_Coordinator/src/com/example/study_coordinator/Register.java