Added circle and oval shapes. Started work on demo app.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/gradle.xml
	.idea/modules.xml
	.idea/vcs.xml
	app/app.iml
	demo-app/build.gradle
	demo-app/demo-app.iml
	demo-app/proguard-rules.pro
	demo-app/src/main/AndroidManifest.xml
	demo-app/src/main/res/drawable-hdpi/ic_launcher.png
	demo-app/src/main/res/drawable-mdpi/ic_launcher.png
	demo-app/src/main/res/drawable-xhdpi/ic_launcher.png
	demo-app/src/main/res/drawable-xxhdpi/ic_launcher.png
	demo-app/src/main/res/layout/activity_main.xml
	demo-app/src/main/res/values/strings.xml
	library/build.gradle
	library/library.iml
	settings.gradle