fixed setting
Merge branch 'master' of https://github.com/IncodingSoftware/mvd-android-sample

Conflicts:
	src/.idea/gradle.xml
	src/.idea/libraries/appcompat_v7_19_0_1.xml
	src/.idea/modules.xml
	src/app/app.iml