base format autocomplete fix
merge
Merge origin/master

Conflicts:
	sandbox/www/css/style.css
	sandbox/www/js/main.js