Use different databases on different git branches
Add survey
Fix & style surveys
DB structure changes
Merge branch 'master' into survey

Conflicts:
	app/assets/javascripts/general.coffee
	app/views/layouts/application.html.haml
	app/views/school/application/_navigation.html.haml
	app/views/student/application/_navigation.html.haml
	config/locales/hr/flash/school.yml
	config/routes.rb
	db/structure.sql
Migrate
Merge branch 'master' into survey

Conflicts:
	app/views/school/application/_navigation.html.haml
	app/views/student/application/_navigation.html.haml
Hardcore survey renaming action
Implement the survey.

Fixes #67.
Fix a cucumber feature
Merge branch 'survey'