moved files from Catroid to catroid
Merge branch 'drone2' into drone2-merge-master