With template dir and path on settings
Merge branch 'master' of github.com:briandeanda/yoamisafe

Conflicts:
	yhack/settings.py