Merge branch 'remote_sapi'
chianwei123 9.19
hey 14.9.21
hey 14.9.21
update dropdown
Merge branch 'remote_et'
 merge
sapi needs to fix views/test.ejs
Merge branch 'master' of https://github.com/Caravel2/beveragesList
09301400 circle hidden
merge
Merge branch 'remote_sapi'
merge
merge all