change column name and more base on soffold advise
Merge branch 'master' of github.com:bay6/preunion into feature/tasks

Conflicts:
	Gemfile
	app/controllers/missions_controller.rb
Merge pull request #18 from williamherry/feature/tasks

change column name and more base on soffold advise