- Merge with master:
	- change packages an imports
	- change path in android-res-files
	- update readme