Began work on the fragment
Merge branch 'master' of https://github.com/kkosinsk/Spot

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