Fixed rendering error with :title
Merge branch 'refs/heads/Rails' into development

Conflicts:
	app/views/layouts/application.html.erb