moved schema.xml to a more logical place
Initial codebase update for April 2013 release.
Resolving branch differences.