wip
Merge branch 'master' into CA-1437-undo

Conflicts:
	dist/wiggi-wiz.js
	dist/wiggi-wiz.js.gz
	src/js/directives/wiggi-wiz-def.js
wip
wip
some tidy
remove log
build
Merge branch 'CA-1437-undo'

Conflicts:
	dist/wiggi-wiz.css.gz
	dist/wiggi-wiz.js.gz
fix build