Merge remote-tracking branch 'origin/master'

Conflicts:
	mobile/www/css/style.css