User management changes
Merge branch 'master' of https://github.com/downwa/innproxy

Conflicts:
	iglooportal/Makefile
	iglooportal/usr/share/iglooportal/www/index.php
	iglooportal/var/lib/iglooportal/apache2.conf