Merge branch 'develop'
Added LICENSE.txt
Updated all other files to correspond to LICENSE change
...except README.txt
Merge branch 'master' into develop