Merge branch 'alain_integration' into tom_integration

Conflicts:
	app/controllers/tags_controller.rb
	app/models/tag.rb
	app/views/tags/new.html.erb
	config/routes.rb
	db/schema.rb
Merge branch 'tom_integration' of github.com:QualityAssured/ExpenseDividerApp into tom_integration