merge
Merge branch 'master'

Conflicts:
	flask/app/ScriptGen.py