add disclaimer
remove gen, add .gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	res/values-fr/strings.xml
remove proguard