Merge branch 'GPII-679' into GPII-434

Conflicts:
	gpii/node_modules/registrySettingsHandler/src/RegistrySettingsHandler.js
	gpii/node_modules/registrySettingsHandler/test/testRegistrySettingsHandler.js
	gpii/node_modules/spiSettingsHandler/src/SpiSettingsHandler.js
	gpii/node_modules/spiSettingsHandler/test/testSpiSettingsHandler.js
	tests/acceptanceTests/AcceptanceTests_builtIn.js
	tests/acceptanceTests/AcceptanceTests_include.js
	tests/acceptanceTests/AcceptanceTests_nvda.js

Author: amb26

LICENSE.txt

@@ -1,16 +1,23 @@
-Copyright (c) 2012, Astea Solutions AD
+All modules are Copyright 2014 Raising the Floor - International except
+where noted otherwise in the code itself, or if the modules reside in a
+separate directory, they may contain explicit declarations of copyright
+in both the LICENSE file in the directory in which they reside and in the
+code itself. No external contributions are allowed under licenses which are
+fundamentally incompatible with the BSD or Apache licenses that the GPII is
+distributed under.
+
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
  * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer. 
- * Redistributions in binary form must reproduce the above copyright notice, 
-   this list of conditions and the following disclaimer in the documentation 
-   and/or other materials provided with the distribution. 
- * Neither the name of OCAD University nor the names of its contributors may 
-   be used to endorse or promote products derived from this software without 
+   list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+ * Neither the name of OCAD University nor the names of its contributors may
+   be used to endorse or promote products derived from this software without
    specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

UsbUserListener/src/UsbUserListener.cpp

@@ -1,14 +1,18 @@
-/*!
-USB User Listener for Windows
-
-Copyright 2012 Astea Solutions AD
-
-Licensed under the New BSD license. You may not use this file except in
-compliance with this License.
-
-You may obtain a copy of the License at
-https://github.com/gpii/windows/LICENSE.txt
-*/
+/*
+ * USB User Listener for Windows
+ *
+ * Copyright 2012 Astea Solutions AD
+ *
+ * Licensed under the New BSD license. You may not use this file except in
+ * compliance with this License.
+ *
+ * The research leading to these results has received funding from the European Union's
+ * Seventh Framework Programme (FP7/2007-2013)
+ * under grant agreement no. 289016.
+ *
+ * You may obtain a copy of the License at
+ * https://github.com/GPII/universal/blob/master/LICENSE.txt
+ */
 
 #include <curl/curl.h>
 #include <dbt.h>

gpii.js

@@ -1,18 +1,23 @@
-/*!
-GPII Windows Personalization Framework Node.js Bootstrap
+/*
+ * GPII Windows Personalization Framework Node.js Bootstrap
+ *
+ * Copyright 2012 OCAD University
+ *
+ * Licensed under the New BSD license. You may not use this file except in
+ * compliance with this License.
+ *
+ * The research leading to these results has received funding from the European Union's
+ * Seventh Framework Programme (FP7/2007-2013)
+ * under grant agreement no. 289016.
+ *
+ * You may obtain a copy of the License at
+ * https://github.com/GPII/universal/blob/master/LICENSE.txt
+ */
 
-Copyright 2012 OCAD University
-
-Licensed under the New BSD license. You may not use this file except in
-compliance with this License.
-
-You may obtain a copy of the License at
-https://github.com/gpii/universal/LICENSE.txt
-*/
 
 var fluid = require("universal"),
     gpii = fluid.registerNamespace("gpii");
 
 require("./index.js");
 
-gpii.start();
+gpii.start();

gpii/node_modules/WindowsUtilities/WindowsUtilities.js

@@ -1,11 +1,14 @@
 /*!
-GPII Universal Personalization Framework GPII windows index
+GPII Universal Personalization Framework GPII Windows Index
 
 Copyright 2014 Lucendo Development Ltd.
 
 Licensed under the New BSD license. You may not use this file except in
 compliance with this License.
 
+The research leading to these results has received funding from the European Union's
+Seventh Framework Programme (FP7/2007-2013) under grant agreement no. 289016.
+
 You may obtain a copy of the License at
 https://github.com/gpii/universal/LICENSE.txt
 */