discard
Merge branch 'master' of https://github.com/Supermio/Boca

Conflicts:
	model/academia.sql
	model/soloacademia
	model/soloacademia.sql