changes after update to Django 1.7
absolute URLs in popups
improve update script
Merge remote-tracking branch 'origin/master'

Conflicts:
	requirements.txt