Various upgrades, added pages
Merge branch 'master' of https://github.com/derekrazo/fanatic-android

Conflicts:
	assets/www/index.html
	bin/fanatic2.apk