updated locales
Merge remote-tracking branch 'tapalilov/develop'
Merge remote-tracking branch 'kalkov/develop'
Merge remote-tracking branch 'kalkov/develop'

Conflicts:
	core/config/locales/en.yml
Merge remote-tracking branch 'tapalilov/develop'
Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop
[specs] minor fixes
Fix i18n issues
Merge branch 'develop' of git://github.com/martakostova/GAKUEngine into develop
Merge branch 'develop' of git://github.com/tapalilov/GAKUEngine into develop
Remove javascript_include_tag
[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
[refacotr] all d&d table use one js
[fix] d&d admission phases table for use universal js
[spec/models] Remove validate_presence_of(:reason) in attendance_spec
[fix] view for admisions method show header and phases index