merged scripts.php hash conflict
Merge branch 'develop' of https://github.com/OpenDataPortal-AT/opendataportal.at into develop