Various changes
Merge branch 'master' of github.com:hltfbk/Excitement-Open-Platform
Merge pull request #315 from adlerm/master

Various changes