alert-popupit pois
Merge branch 'master' of github.com:induktio/LamaTrainer

Conflicts:
	mysite/static/js/builder.js