Merge branch 'master' of https://github.com/mce35/agocontrol

Conflicts:
	core/rpc/html/js/app.js
Merge branch 'master' of https://github.com/mce35/agocontrol

Conflicts:
	core/rpc/html/js/app.js