@GeneratedValue(strategy= GenerationType.IDENTITY)
Merge branch 'master' of https://github.com/lopesdasilva/etoile

Conflicts:
	etoile-play/app/models/Professor.java