make 2
make 5
make 6
make 1,4,7,8,9,10,11,12
Merge branch 'deals.master'

Conflicts:
	admin/tmp/cache/cake_toolbar_cachea8488c17b678dd332ae403bef86ea3cd
	deals/tmp/cache/cake_toolbar_cachea8488c17b678dd332ae403bef86ea3cd