Build update
Merge branch 'master' of https://github.com/LarsWerkman/LicenseView

Conflicts:
	.gitignore