height scroll fix
single fix per action
select state trials
Merge branch 'master' of github.com:ana-balica/WorkNote

Conflicts:
	js/scripts.js