raised version code version name
added feature x
Merge branch 'develop' into release/1.2

Conflicts:
	RepoDemoApplication/app/src/main/res/layout/activity_main.xml
	RepoDemoApplication/app/src/main/res/values/strings.xml