Merge branch 'master' of https://github.com/stream1984/renee-console

Conflicts:
js/controller/main.js
conflict

conflict