Initial Bootstraping of buttons
Merge branch 'master' of github.com:ryansb/panstora

Conflicts:
	panstora/templates/item.mak