aggiunto suporto bluemix
Merge branch 'master' of github.com:pendolous/api

Conflicts:
	routes/index.js