Add "Survey" content
Add form to survey content (with least attributes)
Add settings to Survey
Add state, upper_text and lower_text to form
Set factory_girl as fixture_replacement
Remove section header
Add Survey::Question (only admin side)
Merge branch 'master' of github.com:zomeki/zomeki-development into survey_content

Conflicts:
	db/schema.rb
Merge branch 'master' of github.com:zomeki/zomeki-development into survey_content
Now install spring directly (https://github.com/jonleighton/spring)
Update factory with spring
Answering relations
Add piece to survey
Merge branch 'master' of github.com:zomeki/zomeki-development

Conflicts:
	db/schema.rb