Merge branch 'develop' of git://github.com/absolu7/GAKUEngine into develop
Achievements
Merge branch 'develop' of https://github.com/tapalilov/GAKUEngine into develop
Merge branch 'develop' of https://github.com/Kagetsuki/GAKUEngine into develop
Merge branch 'develop' of https://github.com/Kagetsuki/GAKUEngine into develop
Add roo gem
[ajax] student achievements add/delete/edit form students#show
[fix] typo in student_achievement model validation
Clean core specs
Fix validations in admin/achievements
Merge branch 'develop' of https://github.com/tapalilov/GAKUEngine into develop

Conflicts:
	core/app/models/gaku/achievement.rb
	core/config/locales/en.yml
Fix admin/achievements and add a spec
adding period/method params to importer form
Merge branch 'develop' of github.com:kalkov/GAKUEngine into develop