Details for the routers
Merge remote-tracking branch 'origin/master'

Conflicts:
	thevpn/routing/urls.py
Details for the routers