Merging GPII-389. 2 merge conflicts on license headers.

Author: sgithens

LICENSE.txt

@@ -1,11 +1,4 @@
-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.
-
+Copyright (c) 2012-15, Members of the Raising the Floor Consortium.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -29,4 +22,4 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.