wfw
Merge branch 'master' of github.com:mfantonidas/CoreNet

Conflicts:
	Templates/corenet_admin/corenet.html