Merge branch 'master' of https://github.com/datarc/aurora

Conflicts:
	serviceAPI/controllers/servicesCtrl.js
	serviceAPI/nbproject/private/private.xml
	serviceAPI/nbproject/project.xml
	serviceAPI/server.js
	serviceAPI/services/traffic.js
Merge branch 'master' of https://github.com/datarc/aurora