Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/templates_controller.rb