Only Log
Merge branch 'ng-dev' of https://github.com/riseplus/BuyAndSale into ng-dev

Conflicts:
	log/development.log
	tmp/cache/assets/development/sprockets/059c17069cee79eb8dd808f7ca5aa17e
	tmp/cache/assets/development/sprockets/0b040359b95dd02a7f7b9d5db8e46d4f
	tmp/cache/assets/development/sprockets/2836452cc6ac9f76d8169e17e5c2e000
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/4e199edc896ff69e6c7d6140d5bc1a8f
	tmp/cache/assets/development/sprockets/6ef0a6f6318fda1b3c170c42d6ede0ef
	tmp/cache/assets/development/sprockets/9bbf407d4cf449bf962f397c70a9392d
	tmp/cache/assets/development/sprockets/c0505ffece939729f76fc6a33b80c9eb
	tmp/cache/assets/development/sprockets/db89b9c6764ab21284e2dbb5a7c4d982
	tmp/cache/assets/development/sprockets/e9db894ef7b4028f43fc0b6191a3b8ab
	tmp/cache/assets/development/sprockets/ef2ad5255710af3a3cfccf35da23d4ab
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655