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

Conflicts:
	admissions/app/views/gaku/admin/admissions/_links.html.slim
Merge remote-tracking branch 'kalkov/develop'

Conflicts:
	admissions/app/views/gaku/admin/admissions/_links.html.slim