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

Conflicts:
	.gitignore
update
Updated gradle
Merge remote-tracking branch 'upstream/master'