-added more to dos -recompile js
Merge branch 'master' into feature/query-param

* master:
  -added more to dos -recompile js

Conflicts:
	README.md
	js/console.min.js