Merge branch 'develop' of git://github.com/absolu7/GAKUEngine
Merge remote-tracking branch 'absolu7/develop'
fix admissions student form
mini fix
small fix and merge
mini fix
[WIP] fix grading view
add rails-bootstrap-datepicker.js
[fix] datepicker z-index
Merge remote-tracking branch 'snowsunny/master'
temp commit with new files
Merge remote-tracking branch 'kalkov/develop'
Merge remote-tracking branch 'absolu7/develop'

Conflicts:
	core/app/models/gaku/student.rb
Merge remote-tracking branch 'snowsunny/master'
Merge branch 'master' of github.com:Kagetsuki/GAKUEngine
Merge remote-tracking branch 'marta/master' into develop
exporter setup
added file for spec
Merge branch 'master' of git://github.com/Kagetsuki/GAKUEngine into develop

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