Merged demo app
Merge branch 'master' into scale-type

Conflicts:
	src/main/java/com/vinaysshenoy/okulus/OkulusDrawable.java
	src/main/java/com/vinaysshenoy/okulus/OkulusImageView.java