Merge remote-tracking branch 'kalkov/develop'
[fix] admissions view
Merge remote-tracking branch 'absolu7/refactor_admissions'

Conflicts:
	admissions/db/migrate/20121024072843_create_gaku_admissions_table.rb
	admissions/spec/requests/admission_method_phases_spec.rb
Merge remote-tracking branch 'kalkov/develop'

Conflicts:
	admissions/db/migrate/20121024072843_create_gaku_admissions_table.rb
	admissions/spec/requests/admission_method_phases_spec.rb
	core/config/locales/en.yml
Merge remote-tracking branch 'snowsunny/master'

Conflicts:
	admissions/app/views/gaku/admin/admissions/_phase.html.slim
Merge remote-tracking branch 'tapalilov/develop'
Merge remote-tracking branch 'absolu7/refactor_admissions'

Conflicts:
	admissions/db/migrate/20121024072843_create_gaku_admissions_table.rb
Merge remote-tracking branch 'absolu7/refactor_admissions'
initial colors for attendance types
Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into 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
Merge remote-tracking branch 'absolu7/refactor_admissions'

Conflicts:
	admissions/db/migrate/20121024072843_create_gaku_admissions_table.rb
Merge branch 'develop' of git://github.com/martakostova/GAKUEngine into develop
importers
importers
Merge remote-tracking branch 'upstream/develop'
commented out syllabus scope
Fix specialties