web
Merge branch 'develop' of https://github.com/maciejsto/JSProject.git
into develop

Conflicts:
	web.js
Merge branch 'master' of ssh://git@github.com/maciejsto/JSProject.git

Conflicts:
	src/backend/config/serviceConfig.js
	src/backend/controllers/users.js
Merge branch 'develop'

Conflicts:
	web.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	web.js
Merge branch 'develop'

Conflicts:
	web.js