car battery percentage
car battery percentage
Merge branch 'development' into rasmusPromise
added icons
rename api dir
Merge branch 'rasmusPromise' into development

Conflicts:
	js/services/services.js