fixed server, setup two branches, port forwarding done
Merge branch 'master' into dev

Conflicts:
	icl/settings.py
	icl/wsgi.pyc
	matchmaking/views.py