Adding changes to urls.py
Final changes before moving to latest code release..
Fixed merge conflicts