node-restart script, Makefile
Merge branch 'master' of github.com:HiCloudTeam/hiCloud

Conflicts:
	api/services/hardwareApi.js