Updated EN po file for transifex.
Merge pull request #997 from emanuelschuetze/translation-en-1.5

Updated EN po file for transifex.
Fixed some javascript related problems
Merge pull request #1000 from ostcar/javascript

Fixed some javascript related problems
Update to Django 1.6