aea
Merge http://github.com/AlexanderRothkegel/Conedy

Conflicts:
	testing/moreTests/clearTest.co
Merge http://github.com/AlexanderRothkegel/Conedy
aeia
iaernia
aebieb
aebia