Merge remote-tracking branch 'remotes/origin/danilov/design/ui-design/2016-06-30'

# Conflicts:
#	app/src/main/res/layout/main.xml
#	app/src/main/res/values/strings.xml
#	gradle/wrapper/gradle-wrapper.properties