Changed button colour and hardcoded string
Merge branch 'master' into dev
button colors and icons added
updated gitignore
Merge branch 'dev' of https://github.com/oSoc14/Artoria into dev
changed text colors
Removed keys from dev
Merge branch 'dev' of https://github.com/oSoc14/Artoria into dev

Conflicts:
	app/src/main/res/values/keys.xml
#74 used better locationproviders, ....
Merge branch 'dev' of https://github.com/oSoc14/Artoria into dev
#76 fixed git push
new release
Added release apk