Signed-off-by: pachacutec <agustin.march@gmail.com>
Merge branch 'dp' of github.com:enableiot/iotkit-agent into dp
adding admin page
Merge branch 'dp' of github.com:enableiot/iotkit-agent into dp

Conflicts:
	lib/common.js