error handling, glass prices, boost, index stuff
Merge remote-tracking branch 'origin/master' into gh-pages