Reverting to before merge with mass_assignment - proper UI
Merge branch 'staged' of https://github.com/Gonghan/whiteboard into staged
Removed headless gem
Conflicts:
	spec/spec_helper.rb