added DRY templates (woohoo)
Actual merge issues...

Merge remote-tracking branch 'origin/master'
deleted forms.py