no message
Merge branch 'master' of https://appjamdemo.scm.azurewebsites.net:443/appjamdemo

Conflicts:
	chooseItem.html
Merge remote-tracking branch 'origin/master'