New styling
New styles
Merge branch 'master' of https://github.com/MOLEDesign/wwwNetworkActivator

Conflicts:
	templates/network_activator/css/custom.css