Table sorting issue fixed.
Merge branch 'master' of https://github.com/ncyclo/ncycloapp.git

Conflicts:
	ncycloapp/src/main/webapp/resources/jsapp/chartutility.js
Merge branch 'master' of https://github.com/ncyclo/ncycloapp.git
Cost optimization and scenario planning UI changed.