Refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	build.xml
Merge branch 'master' of /home/yannick/Projects/buildmagic with conflicts.