Removed keys from dev
Merge branch 'dev' of https://github.com/oSoc14/Artoria into dev

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