Removed changes which was going to other pull request.
Merge branch 'master' of https://github.com/juhanihaapala/concrete5