Merge pull request #375 from rzanoli/master

prepare for next development iteration
Merge branch 'master' of https://github.com/hltfbk/Excitement-Open-Platform.git
Getting changes and merging