Restructure some blocks, default simulator to enabled
Merge branch 'develop'

Conflicts:
	app/index.html