Angular ui routing
Merge branch 'master' of github.com:jackdevil/django-project-template