Does not lose focus when screen saved.
Merge branch 'master' of https://github.com/a71993/AngularProtoypeEngine

Conflicts:
	protoAngular/client/screen/screen.tpl.html
Merge branch 'master' of https://github.com/a71993/AngularProtoypeEngine
Merge branch 'master' of https://github.com/a71993/AngularProtoypeEngine

Conflicts:
	protoAngular/client/screen/screen.js
Deleted comment
Merge branch 'master' of https://github.com/a71993/AngularProtoypeEngine