Merge branch 'monsoulNewFeature' of https://github.com/ludwiksh/PAS into monsoulNewFeature

Conflicts:
	web-server.js
Merge branch 'monsoulNewFeature' of https://github.com/ludwiksh/PAS

Conflicts:
	web-server.js
pas.TODO
merge again
merge
Merge branch 'monsoulNewFeature' of https://github.com/ludwiksh/PAS into monsoulNewFeature
Merge branch 'monsoulNewFeature'
add test
test