Master copy- wrapped apply now

Master copy with a wrapped apply formstack, for modular integration
purposes
Modal/employer fixed

Modal fixed, and Employer app wrapped as well
Merge branch 'Story3_formstack_final'

conflicts updated