Merge branch 'dev' of github.com:DataPoints/Sprint-1 into Feature#77

Conflicts:
	.idea/Sprint-1.iml
	.idea/runConfigurations/Development__Sprint_1.xml
	.idea/runConfigurations/test__Sprint_1.xml
	.idea/workspace.xml
	app/views/layouts/application.html.erb
	config/routes.rb
	db/schema.rb