first commit
first commit
'random'
spot-catcher
'jou'
spot-catcher
Merge remote-tracking branch 'origin/pr/1' into devel

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/fi/tiko/tamk/spotcatcher/ui/MainActivity.java