deleted needless file, v. sorry for leaving trash :D
Merge branch 'phynalle' into devel