modified User API to return text
Merge branch 'master' of git.hungryhub.com:/home/hungryhub/booking

merged
bootstrap 3 gem added