Merge branch 'master' of https://github.com/icstars/EatNRUn

Conflicts:
	mobilesrc/eatAndRun/www/aboutpage.html