Merge
Merge branch 'master' of https://github.com/airin12/MeetEverywhere.git

Conflicts:
	Meet Everywhere/src/com/meetEverywhere/common/User.java