Merge branch 'ipv6' into dev
Merge branch 'mysql_escape' into dev
File manager hack fix

  File manager enabled users to create directories anywhere within the system
by using ../ in the dirname. Disallow usage of .. in dirnames (based on
MR for 6276af9b973e958030c2f805426aff8e386b0d19 commit).
Merge pull request #51 from semirke/dev

Minor changes and IPv6