removed 'Alaxos' root folder
Merge branch 'dev'