-
Merge branch 'master' of https://github.com/dcfvg/banc-bi-js

Conflicts:
	public/less/style.less
	router.js
	views/redaction.jade
editor page