Merge branch 'develop' of https://github.com/kalkov/GAKUEngine into develop

Conflicts:
	core/app/models/gaku/exam_portion.rb
[view] fixing attachment disposals
[fix] fix attachment disposals specs
[spec helper] add flash_recovered? method
[facotry] add traits for attachment factory
[fix] deleting and creating attachments
Merge branch 'develop' of https://github.com/tapalilov/GAKUEngine into develop

Conflicts:
	core/app/controllers/gaku/attachments_controller.rb
	core/config/locales/en.yml