updated screen add script
Merge branch 'dev2'

Conflicts:
	scripts/AddScreenData.groovy
Merge branch 'dev2'
Merge branch 'dev2'
Merge branch 'dev2'
Merge branch 'dev2'
Merge branch 'dev2'
Merge branch 'dev2'
Merge branch 'dev2'
Merge branch 'dev2'
Merge branch 'dev2'
Merge branch 'dev2'
Merge branch 'dev2'
fixing things up and added js autocomplete again