Changes to make the app Bluemix compatible
Merge commit 'c0aef55adcefbe63506d8a760da2edb6b659f57e'