Debug mode added
Small fixes
Merge branch 'master' into whereIsMyCar

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