Merge branch 'master' of git://github.com/kalkov/GAKUEngine into develop
Merge branch 'refactor_admissions' of git://github.com/absolu7/GAKUEngine into develop
Merge branch 'refactor_admissions' of git://github.com/absolu7/GAKUEngine into develop
Merge branch 'develop' of git://github.com/tapalilov/GAKUEngine into develop
fix conflict after merge
Merge branch 'refactor_admissions' of git://github.com/tapalilov/GAKUEngine into develop
Merge branch 'develop' of git://github.com/tapalilov/GAKUEngine into develop
Refactor seeds and sample data
Merge branch 'develop' of git://github.com/tapalilov/GAKUEngine into develop
Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop
pull from tapalilov
[core] Try to fix failing specs
Move localeapp to gemspec instead of Gemfile
Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop
[spec/requests] Fix csv_spec
[spec/requests] Fix exam_portions_spec
Try to fix student_worker under postgres
Clean migrations
Try to fix posgresql error on address
Clean models and remove unused gems