Made sure context files are loaded in the way that MFA beans could override non-mfa beans.
Refactored codebase to move flows into their own sub directory. removed mfa-servlet and merged changes with cas-servlet instead.
Merge pull request #46 from Unicon/ENSURE-CTX-LOAD-ORD

Reorganize application context files
Merge branch 'master' into GREETING-W-COMMA