Changes for v1.2 of TotalSpaces
Merge branch 'web' of git://github.com/binaryage/totalspaces-web into web