Maed Picker. And strings
login stuff
Merge branch 'master' of https://github.com/rinnly/fish into rinnly-master

Conflicts:
	res/layout/end_session.xml
	res/layout/new_session.xml
	res/values/strings.xml