Merging mixare into our project
removed some things
updated settings.gradle to new project structure
Got mixare to compile
Changed the package layout a bit, better mixare integration into our app
Forgot a dot
Removed deprecated setting in mixare
Changed target SDK to 20
Merge branch 'mixare' of https://github.com/oSoc14/Artoria into mixare
Merge branch 'dev' into mixare
Removed license on first acces
Merge branch 'mixare' of https://github.com/oSoc14/Artoria into mixare
updated manifest for camera permissions
Merge branch 'mixare' of https://github.com/oSoc14/Artoria into mixare
Getting mixare to use artoria data
updated manifest
Merge branch 'mixare' of https://github.com/oSoc14/Artoria into mixare
Using artoria data
Merge branch 'mixare' of https://github.com/oSoc14/Artoria into mixare
Changed datConvertor to use Artoria data #34