Minor alignment tweaks
Merge pull request #1277 from cohitre/merge_master_sake_bomb

Merge master sake bomb
Merge pull request #1278 from kyungmin/sake-bomb-phase3

Alignment tweaks
Merge remote-tracking branch 'balanced/master_sake_bomb' into merge_master_sake_bomb

Conflicts:
	app/templates/_marketplace_sidebar.hbs