merging redesign schools branch into trunk
Merge pull request #246 from ercchy/master

merging redesign schools branch into trunk