changed controllers
Merge branch 'master' of http://github.com/yeoman9/timetablemgmt

Conflicts:
	src/java/com/timetablemgmt/controllers/PrincipalController.java