Named all url and update html harcoded links
fixed merge conflic on url.py after naming urls
Merge branch 'master' of git://github.com/umdsp/romeu