Merge https://github.com/expertiza/expertiza

Conflicts:
	Gemfile
	Gemfile.lock
	config/database.yml
	test/fixtures/assignment_questionnaires.yml
	test/unit/assignment_test.rb
merged E732