fix js problem
Merge branch 'master' of https://github.com/mooolen/AEG

Conflicts:
	static/base/js/application.js