Merge branch 'master' of https://github.com/zorrored/MenuAdvisor

Conflicts:
	MenuAdvisor/www/index.html
	MenuAdvisor/www/js/index_user_scripts.js