clean up
Merge branch 'master' of https://github.com/dpgaspar/flask-general

Conflicts:
	app/general/views.py
	app/translations/pt/LC_MESSAGES/messages.mo
	app/translations/pt/LC_MESSAGES/messages.po
	babel/messages.pot
File and image support