Few more changes
few more
Merge branch 'master' of https://github.com/ncyclo/ncycloapp.git

Conflicts:
	ncycloapp/src/main/webapp/resources/js/channelattribution-charts.js
	ncycloapp/src/main/webapp/resources/js/frequency-charts.js
Few More changes