updates
Merge branch 'master' of https://github.com/dvargo/mm4

Conflicts:
	MeetMeFor/src/main/java/com/dv/meetmefor/buisness/MeetingConnector.java
	MeetMeForModel/src/main/java/com/dv/meetmefor/model/entity/UserAccount.java