Changes styles
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/vcs.xml
	app/src/main/res/values-v21/styles.xml
	app/src/main/res/values/styles.xml