External Resources
Merge branch 'master' of https://github.com/lopesdasilva/etoile

Conflicts:
	etoile-play/app/views/professormenu.scala.html