yes yes yes
Merge branch 'dev' of https://github.com/chalermpondasri/shiny.bamboo into dev

Conflicts:
	app/view/MyViewport.js
	metadata/view/MyViewport