phil and some server specific changes
Merge branch 'master' of github.com:webadminontario/liberalonline
phil and jesse
Merge remote-tracking branch 'upstream/master'
document editor select2 enhancements and a bug fix for validation