Merge remote-tracking branch 'kalkov/develop'
[fix] admissions view
Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop
Added icons to student index
Add exams to syllabus index
Remove audited gem and install paper_trail
[css] add jquery ui css
[chooser] pagination, counting, autocomplete custumization
[migration] rename student speciality is_mayor filed to is_major
[migration] rename specialities only_mayor filed to only_major
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
[ajax/curd] Specialties Admin
WIP : Create admin/changes for student, student_addresses, student_contacts
pull from absolu7