HSWebteam/ultraform — pull request #141 by HendrikJan (2014-08-25 12:01:28+00:00)
Title: manually merged some changes

Some changes were not correctly committed to GIT, so we had to merge manually.