Merge branch 'master' of github.com:leonson/smartanws

Conflicts:
	src/controller/Controller.java