Updating mixare to use Arotria data #34
Merge branch 'mixare' of https://github.com/oSoc14/Artoria into mixare

Conflicts:
	app/src/main/java/be/artoria/belfortapp/mixare/data/convert/MixareDataProcessor.java