Merge branch 'develop' of https://github.com/absolu7/GAKUEngine into develop

Conflicts:
	admissions/app/views/gaku/admin/admissions/_links.html.slim
fix conflict in admission links view
minor fixes and refactoring