not editable text
Merge branch 'master' of https://github.com/Fjoren/CapitalOne

Conflicts:
	app/src/main/res/layout/main_settings_view.xml