merged branch

I don't really know what happened. An error occourred when I was trying
to merge the devel and master branch, so I have to commit the files
manually