Merged master into syntaxDiff

Masala/public/js/masala.js

Masala/src/Config/Config_template.curry

Masala/src/Config/RoutesData.curry

Masala/src/Controller/Category.curry

Masala/src/Controller/CurryModule.curry

Masala/src/Controller/Package.curry

Masala/src/Controller/Search.curry

Masala/src/Controller/Shared.curry

Masala/src/Controller/SpiceySystem.curry

Masala/src/Controller/Upload.curry

Masala/src/Controller/User.curry

Masala/src/Controller/Version.curry

Masala/src/FileUpload/FileUpload.cabal

Masala/src/FileUpload/Main.hs

Masala/src/HTML/Base.curry

Masala/src/HTML/CgiServer.curry

Masala/src/Model/Masala.curry

Masala/src/System/Authorization.curry

Masala/src/System/PackageUpload.curry

Masala/src/System/Routes.curry