Redesigned Pref Activity
Merge remote-tracking branch 'origin/master'

Conflicts:
	indytrip/app/src/main/res/values/strings.xml