Regroup Code and prepare for launch
Merge branch 'master' of github.com:IEEEAcademic/test_deploy

Conflicts:
	app/controllers/initial_controller.rb
	app/views/initiative/contents.html.erb