pull tapalilov + fix
Merge remote-tracking branch 'kalkov/develop'
[fix] admissions view
Added icons to student index
Merge branch 'develop' of git://github.com/tapalilov/GAKUEngine into develop
Add exams to syllabus index
Remove audited gem and install paper_trail
[admission specs] add exam to an admission method phase
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
Applicant views/ students scopes
Merge remote-tracking branch 'tapalilov/develop'
Merge remote-tracking branch 'absolu7/refactor_admissions'

Conflicts:
	admissions/db/migrate/20121024072843_create_gaku_admissions_table.rb
add student default scope
Merge remote-tracking branch 'absolu7/refactor_admissions'
add student default scope
add none to new student class_group dropdown
remove class_group from admissions new applicant
initial colors for attendance types