Merge branch 'master' of https://github.com/Ryang89/TMS-Magic

Conflicts:
	src/taskmgt/Models/ModelType.java
	src/taskmgt/Models/TeamLeader.java
	src/taskmgt/Models/TeamMember.java
	src/taskmgt/Models/User.java
	src/taskmgt/TaskMgt.java