Merge branch 'master' of git://github.com/Kagetsuki/GAKUEngine into develop
clean admission students views
delete admissions  unneede student views
Merge branch 'develop' of git://github.com/absolu7/GAKUEngine into develop

Conflicts:
	core/app/models/gaku/student.rb