Only Log
Merge branch 'development' of https://github.com/riseplus/BuyAndSale into development

Conflicts:
	log/development.log
	tmp/cache/assets/development/sprockets/0dbc9be97a2bdb55156a4b0dc8f67366
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/3cd60b3d8a714ddcdc4256558f0aedc0
	tmp/cache/assets/development/sprockets/415cba7de981a2df5af982b546bbf064
	tmp/cache/assets/development/sprockets/5b31390bb454d608e3d9f5dd7ebbf808
	tmp/cache/assets/development/sprockets/6ac5d4f8cbdc6442ff5595f2597712d8
	tmp/cache/assets/development/sprockets/8981a081b547e0859cfbbe9438153ed6
	tmp/cache/assets/development/sprockets/a1bef3f3739f327b0c46acf7e6d961fe
	tmp/cache/assets/development/sprockets/d3ed0b47c81dae0a73882c68d7d9e593
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655