delete gen folder
delete gen folder
ignore gen folder
ignore gen folder
Merge branch 'Develop'

Conflicts:
	app/java/gen/org/pocketworkstation/pckeyboard/R.java
Merge branch 'master'