GPII-98 Adding android.json stub, needed to allow logging in without error.
Device Reporter, Solutions, Preferences for WSIS and Google I/O Demos
Merge branch 'google-io' into GPII-120
GPII-20: Added two new events to the lifecycle manager - for when user settings have been applied / removed, respecitvely)
GPII-120 putting development configs back the way they were. Fixing android device listing file name to match conventions from other platforms.
GPII-120 Fixing up formatting
GPII-120 Trying to get back the existing non end of file newline
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