finally
Merge branch 'master' of https://github.com/redmoses/tripodea

Conflicts:
	tripodea/settings.pyc