Finished preliminary work on services
Finished preliminary work on services
Merge branch 'master' of https://github.com/moiri-gamboni/travellog

Conflicts:
	static/js/helpers.js