removed misc.xml, Catroid.iml, catroidSourceTes.iml, merge-conflict