cambios
Merge branch 'master' of https://github.com/jhanlos/akademy

Conflicts:
	.target/controllers/Application.class
	alldata.h2.db