updated server
Merge branch 'master' of github.com:rbrcurtis/proxy-hem

Conflicts:
	src/proxy-hem.coffee