fixed a huge mess
Merge branch 'master' of http://github.com/mouseville/mouseville