makeup
Merge branch 'master' of https://github.com/Halicea/hal_automator

Conflicts:
	automator_project/src/hal_configurator/web/web_server.py