Prevent conflicts with minified JS during merges
Merge branch '2.0' of github.com:WoltLab/WCF into 2.0