Cleaned/streamlined CSS, various fixes
Merge branch 'master' of https://github.com/Evan-Goode/3ten

Conflicts:

platforms/ios/3ten.xcodeproj/project.xcworkspace/xcshareddata/3ten.xcche
ckout
	platforms/ios/www/js/content.js
	www/js/content.js
Built