[master]
Merge branch 'master' of github.com:hell0again/mario

Conflicts:
	app/assets/coffee/template/bb-assem-template.tpl
	app/assets/coffee/view/bb-assem-view.coffee
	app/assets/coffee/view/bb-assem/assem-detail-view.coffee
tmp
Merge branch 'master' of github.com:hell0again/mario

Conflicts:
	app/assets/coffee/view/bb-assem-view.coffee
	app/assets/coffee/view/common/stack-layout-view.coffee