Removed unnecessary code
Merge branch 'master' of https://github.com/agentada/agentada

Conflicts:
	api/controllers/ItineraryController.js
Fixed openshift session storage
Setup non-hardcoded paths
Merge branch 'master' into develop