Added skeleton Settings activity.
Changed  resource ids to support the short and long versions of strings.
Tweaked UI of card layouts.
Merge branch 'master' of https://github.com/bendywalker/insulator

Conflicts:
	insulator/res/layout/activity_settings.xml