Merge branch 'develop' of git://github.com/martakostova/GAKUEngine into develop
remove default enrollment status from stuednt model
Merge branch 'develop' of git://github.com/absolu7/GAKUEngine into develop

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