Merge pull request #194 from wick-ed/master

added mage servlet as global dependency
buildfiles/debian/DEBIAN/conffiles
reverted a change