validation (requires separate form names to use angular validation, hence repeated views)
Merge remote-tracking branch 'origin/develop' into develop