Merge branch 'local'

Conflicts:
	web.js
web
Merge branch 'master' of heroku.com:jsproject into develop

Conflicts:
	web.js
Merge branch 'local'

Conflicts:
	web.js
Merge branch 'temp'

Conflicts:
	web.js
Merge branch 'master' into develop

Conflicts:
	web.js
fix mongo config
services config
service manager
service manager
Merge branch 'master' of https://github.com/maciejsto/JSProject.git
Merge branch 'develop' of https://github.com/maciejsto/JSProject.git
into develop

Conflicts:
	web.js