removed all references to field errors in signup and replaced with single error for form
fixed merge conflict in apptemplates