AFW-398 AFW-401 #resolve

Merge branch 'master' of https://github.com/samluescher/django-form-designer

Conflicts:
	form_designer/admin.py
	form_designer/migrations/0008_auto__add_formvalue__del_field_formlog_data__add_field_formlog_created.py

Also made a custom form template that shows messages.