Code to change:
1) remove Forms from collection lists
2) To add the ability to add new dataElement Collections from the Pathways screen without going back to the main curation screens.
NB Currently a problem with the saving of new dataElementCollection in the pathwayAjaxFunctions.createCollection() calling the CollectionController.saveBasketCollection() method. From ajax the parameters do not appear in the params collection, whereas from the gsp they do...
MC-117 #close Updated the pathways nodes to add new data element collections, also fixed the filter so that Forms do not appear Data Element Collection listings.
Finish MC-117

Conflicts:
	grails-app/views/pathwaysModel/show.gsp
	web-app/js/pathways/AppViewModel.js
	web-app/js/pathways/pathwayAjaxFunctions.js
fixed (unbroken locally) tests|
NHIC importer

+ fixing missing glyphicons
Merge branch 'origin/develop'
Merge branch 'develop' of github.com:amilward/MDR into develop
Merge branch 'origin/develop'
fixing errors in build
David - update of Bootstrap "hide" and other minor changes
David - update of 'hide'
Adding test for pathways list
Fixed MC-147 by adding pathway service to return only top-level pathways
added test for pathway list in dashboard
fixed MC-147, all top pathways loaded properly on dashboar page
Fixes MC-147, refactored to move CSS selectors into page class
Merge branch 'feature/MC-147_subpathways' into develop
committing before I pull the latest dev changes
Merge branch 'develop' into feature/ModelCatalogue0.3

Conflicts:
	grails-app/conf/ApplicationResources.groovy
	grails-app/controllers/uk/co/mdc/model/ModelController.groovy
	web-app/js/model/model/model.js
Latest changes