started updatelecture
Merge branch 'master' of https://github.com/Project-Phoenix/Website

Conflicts:
	app/controllers/GroupApplication.java