update
Merge branch 'development' of https://github.com/sdvinfo/SwedishCrown into development

Conflicts:
	web2py/httpserver.pid