Application assignment form changes.
Merge remote-tracking branch 'fao/master' into test