merge
Merge branch 'master' of github.com:induktio/LamaTrainer
Merge branch 'master' of github.com:induktio/LamaTrainer
Merge branch 'master' of github.com:induktio/LamaTrainer

Conflicts:
	mysite/static/js/simulator.js