js changes
Merge branch 'master' of https://github.com/neri14/projekt_zespolowy

Conflicts:
	web_app/duta.v11.suo