fixed url i hope
Merge commit '2cbff9d'

Conflicts:
	autosar/urls.pyc
	autosar/urls.py~
	request/urls.pyc
	request/urls.py~
	request/views.pyc