local changes
Merge branch 'master' of github.com:supreethks/android-styled-dialogs

Conflicts:
	library/build.gradle
	library/project.properties