Production mode complete
Production mode (2)
Merge branch 'ng-dev' of https://github.com/riseplus/BuyAndSale into ng-dev

Conflicts:
	tmp/cache/assets/development/sprockets/1560bbd03122b1047468e0888e427538
	tmp/cache/assets/development/sprockets/168af915960a63e8895190f61b5fb3cd
	tmp/cache/assets/development/sprockets/213f96ce22d21cbafb60245e4c1e8d4b
	tmp/cache/assets/development/sprockets/315c3766b6e2dbcf0ce31e5ff7b1d81e
	tmp/cache/assets/development/sprockets/c68cb979df3cc185ab8c8dc8d5a3089d
..