some little changes
Merge branch 'master' of https://github.com/hezo/botsie.git

Conflicts:
	botmodules/rest/admin.js