removed unnecessary call to /jsi18n in base.html
Merge remote-tracking branch 'origin/appsembler_develop' into appsembler_develop

Conflicts:
	mediathread/templates/base.html