Colors
Merge branch 'master' of https://github.com/ncyclo/ncycloapp.git
Merge branch 'master' of https://github.com/ncyclo/ncycloapp.git

Conflicts:
	ncycloapp/src/main/webapp/resources/js/channelsequence-charts.js
	ncycloapp/src/main/webapp/resources/js/chartutility.js