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

Conflicts:
	app/views/calendarioadministrativo.scala.html
	app/views/main.scala.html
	app/views/modulobase.scala.html
	app/views/role.scala.html
Merge branch 'master' of https://github.com/jhanlos/akademy

Conflicts:
	app/views/calendarioadministrativo.scala.html
	app/views/main.scala.html
	app/views/modulobase.scala.html
	app/views/role.scala.html
persistence
ch
db
da