changes in ui
Merge branch 'master' of https://github.com/rkunche/vue_testProject

Conflicts:
	.idea/.name
	.idea/modules.xml
	app/app.iml
	app/src/main/java/com/test/vue/vuetest/presenters/CardWithFlipper.java
	app/src/main/res/values/strings.xml
Merge branch 'master' of https://github.com/rkunche/vue_testProject
Merge branch 'master' of https://github.com/rkunche/vue_testProject
added my files
added all my changes to custom action bar