Did some work on webserver

Signed-off-by: gitta-mannen <mail@janpettersson.com>
Merge branch 'server' of git@github.com:gitta-mannen/MMAFL.git into server

Conflicts:
	code/server/src/server/HttpServer.java
	code/server/www/index.html

Signed-off-by: gitta-mannen <mail@janpettersson.com>