A lot of work
Merge branch 'develop' of git://github.com/simsite/simsite into develop