Merge pull request #33 from joeelsey/dev

Dev
concierge call fail test
concierge fail test
CLEAN UP 1
clean up 1.5
fail concierge call
clean up 2
Merge pull request #35 from Chareesa/dev

cleanup one
Merge branch 'dev' of https://github.com/ecjs/Concierge into dev
add user route for all user info
upstream