changes as of 2013-01-15T22:24:40.348412
Merge branch 'master' of github.com:kallosforcouncil/platform