override
Merge branch 'master' of https://github.com/joroni/love-froyo-020914

Conflicts:
	www/index.html
override