updated locales
Merge remote-tracking branch 'tapalilov/develop'
Merge remote-tracking branch 'kalkov/develop'
pull from tapalilov
pull tapalilov
Merge branch 'develop' of git://github.com/martakostova/GAKUEngine into refactor_admissions
Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop
admissions soft delete
Merge remote-tracking branch 'kalkov/develop'

Conflicts:
	core/config/locales/en.yml
Merge remote-tracking branch 'tapalilov/develop'
[grading/fix] present as default attendance type, blank are allowed for reason
refactor admission phases spec (no order)
[js] move sortable js for admissin phases to core
[fix] fix in admissions controller
Merge branch 'master' of git://github.com/Kagetsuki/GAKUEngine into develop
Merge branch 'develop' of git://github.com/martakostova/GAKUEngine into develop
Merge branch 'develop' of git://github.com/tapalilov/GAKUEngine into develop
Merge branch 'refactor_admissions' of git://github.com/absolu7/GAKUEngine into develop

Conflicts:
	admissions/db/migrate/20121024072843_create_gaku_admissions_table.rb
	admissions/spec/requests/admission_method_phases_spec.rb