NHIC importer
fixing missing glyphicons
Added import for one dataset and tested
bumped version number to 0.1.2

Updating gitignore to only care about bootstrap data in WEBINF

removing spurious old files
Adding gradle support, to be used to install bower dependencies
Merge branch 'develop' into feature/angular_pathways
Merge branch 'feature/angular_pathways' into develop
Moving dashboard to /dashboard from /
Fixes MC-153 by splitting dashboard into /dashboard
Merge branch 'feature/MC-153_registration' into develop
Refactoring Spec tests
MC-160 #fixed. Added a site map icon to nodes which have sub pathways so they are visually distinguishable. Added tests :).
Adding Gradle build of dependencies, and updated README
Adding support for node runs without a custom PATH variable
Fixes MC-161
Merge branch 'develop' of github.com:amilward/MDR into develop
MC-155_NodeName_as_NodeDescription - Test created - MSAG
test for making the name and description text the same when creating a node has been deleted.
test “Check that when I create a node with no description then the description is blank” has been added — as suggested by Ryan
Test and fix for issue MC-133 - “Create node form - Name textbox - Clear content after the user has cancelled the action”
Fix apply to both name and description text boxes.
Merge branch 'develop' into feature/ModelCatalogue0.3

Conflicts:
	grails-app/conf/Config.groovy
	grails-app/conf/UrlMappings.groovy
	grails-app/controllers/uk/co/mdc/CollectionBasketController.groovy
	grails-app/controllers/uk/co/mdc/IndexController.groovy
	grails-app/services/uk/co/mdc/utils/importers/ImportNHICService.groovy
	grails-app/views/admin_index.gsp
	grails-app/views/dashboard/index.gsp
	test/functional/uk/co/mdc/pathways/AddSubPathwayToNodeSpec.groovy
	text.txt