Introduced Settings global
Merge branch 'master' of https://github.com/shanti-uva/shantiHTML

Conflicts:
	js/main.js
Merge branch 'master' of https://github.com/shanti-uva/shantiHTML
back to subjects not places
make sure to handle return in field