preparing for merging
Merge branch 'master' of https://github.com/yunarta/secure-preferences

Conflicts:
	.gitignore
	library/AndroidManifest.xml
	library/build.gradle
gitignore