Upgrade schema to Spring 3.2
Merge remote-tracking branch 'origin/develop' into admin3
Merge remote-tracking branch 'upstream-DemoSite/admin3' into develop