Moved js/html to template.
Merge branch 'master' of github.com:SigmaEducation/django-mashup