fix few code style issues
add angular-bootstrap-colorpicker as a bower dependency
Merge remote-tracking branch 'origin/develop' into develop