Merge branch 'master' of https://github.com/dzigerlig/CDAR.git

Conflicts:
	WebContent/cdarclient/app/js/appConsumer.js
	WebContent/cdarclient/app/js/appProducer.js
	WebContent/cdarclient/app/js/myJsTree.js
Merge branch 'master' of https://github.com/dzigerlig/CDAR.git