Merge branch 'master' of git://github.com/danielweinmann/catarse

Conflicts:
	app/controllers/projects_controller.rb
	app/views/adm/projects/index.html.slim
	app/views/projects/_formatting_tips.en.html.slim
	app/views/projects/_formatting_tips.pt.html.slim