GPII-20: Added two new events to the lifecycle manager - for when user settings have been applied / removed, respecitvely)
GPII-20: Merge branch 'GPII-119' into GPII-20
GPII-20: Split the makeConfigLoader into two parts -- one that returns defaults and one that actually launches the server
GPII-20: Integration testing functionality
GPII-20: index.js loads integration test file as well
GPII-20: Adding attempt to stop server for yura to look at
Merge branch 'GPII-20' of github.com:kaspermarkus/universal into GPII-20
GPII-20: simplified integration testing file.
Merge pull request #2 from yzen/GPII-20

GPII-20: Merging Yuras suggestions
GPII-20: commiting for yura to look at
GPII-20: udpated middleware to not break the integration tests.
GPII-20: Cleaned up integrationTesting... all tests are now passing
GPII-20: JS linted and ready for review
Merge branch 'GPII-119' into GPII-20

Conflicts:
	gpii/node_modules/gpiiFramework/configLoader.js
	gpii/node_modules/gpiiFramework/middleware.js
	gpii/node_modules/gpiiFramework/server.js
	gpii/node_modules/testFramework/index.js
GPII-20: removed integration tests from allTests.js, as these are dependent on the OS, and hence should be run from there
GPII-177: updated reference to fluid infusion
GPII-20: Merged with yura's settingshandler changes, updated according to latest fluid
GPII-20: Merged with yura's settingshandler changes, updated according to latest fluid
GPII-20: Merged in NP sets, ontology, installed solutions and solution registry. next to test that it works and write integration tests
GPII-177: Merging integration testing branch

Merge remote-tracking branch 'origin/GPII-20' into GPII-177