2888 app forms phase ii

merging back to phase II branch