* Custom description for each action
* Logout feature
Merge branch 'master' of https://github.com/richk/ProjectBeacon

Conflicts:
	res/layout/activity_settings.xml
	res/values/strings.xml
	src/com/codepath/beacon/SettingsActivity.java