Change License file and add license information to pom.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	LICENSE.txt