Minor changes.
Security commit before branching.
Merge branch 'master' of https://github.com/Jamtis/FluidWeb.git