.idea of RubyMine (not use)
.idea of RubyMine
.idea/workspace
Merge branch 'ng-dev' of https://github.com/riseplus/BuyAndSale into ng-dev

Conflicts:
	tmp/cache/assets/development/sprockets/05296145838e65e867f06ed0f96ada15
	tmp/cache/assets/development/sprockets/06e19d3f6729f5836ddf59a72170451a
	tmp/cache/assets/development/sprockets/06e571fa9816bf1c773150cef7d5e572
	tmp/cache/assets/development/sprockets/0720fab42f0ec72d1eeeec9d8c3923cd
	tmp/cache/assets/development/sprockets/08a4b5d6e077cd0315b8b2973372b827
	tmp/cache/assets/development/sprockets/08ea65aa7a4d97ea6769a11b9dd27955
	tmp/cache/assets/development/sprockets/0c915096248d480b547323e8b4be6ea7
	tmp/cache/assets/development/sprockets/12bcd1ddd2d7071077acf1c674be8d3d
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/14a1758d7d11e4c9d1406f682e65d77d
	tmp/cache/assets/development/sprockets/1572d44e885ea02cc03b9ee4f2957457
	tmp/cache/assets/development/sprockets/1d1e5bb921031ebe54fdaaa247f69016
	tmp/cache/assets/development/sprockets/1ddada02cbd25b423bd48f7ec21d8c23
	tmp/cache/assets/development/sprockets/1f059c560083bdb7cc04f8dd9ac33bd0
	tmp/cache/assets/development/sprockets/1fbd4fe1658c05654d186260a58dae47
	tmp/cache/assets/development/sprockets/24fa3e82857a44848e522e965d904110
	tmp/cache/assets/development/sprockets/2836452cc6ac9f76d8169e17e5c2e000
	tmp/cache/assets/development/sprockets/2a6ea7d9ab49d837d99449486c83d626
	tmp/cache/assets/development/sprockets/2ae28a762c84059938f9eb6f614705bc
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/2fe46eed9a904eff24c8c6c1c3771173
	tmp/cache/assets/development/sprockets/334b38620a8c4b84398f59e3e8698618
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/37e13271fec6351d864d75ebd4ce78d8
	tmp/cache/assets/development/sprockets/38fc6a633722205d05b862a5904df6a9
	tmp/cache/assets/development/sprockets/3a6c392793f6ad8e9d136b5c616e49f6
	tmp/cache/assets/development/sprockets/3b553fa8f63d03132a4e089c11f11b3b
	tmp/cache/assets/development/sprockets/3cd60b3d8a714ddcdc4256558f0aedc0
	tmp/cache/assets/development/sprockets/3d75840395edfa0701082788842c8964
	tmp/cache/assets/development/sprockets/3f79e204fa08766ae98f2119fb5f6d44
	tmp/cache/assets/development/sprockets/404da52fff65ec0ab4c3f4322a23f737
	tmp/cache/assets/development/sprockets/409be9f7ad5cb1d2e8750dfa51aae8cd
	tmp/cache/assets/development/sprockets/415cba7de981a2df5af982b546bbf064
	tmp/cache/assets/development/sprockets/4377b836d56d4d13f1fb7906322c5d68
	tmp/cache/assets/development/sprockets/4625e8da876ee2fc154b3007d401209a
	tmp/cache/assets/development/sprockets/4a834e9b9f6f08536551e5b5916c4fcb
	tmp/cache/assets/development/sprockets/4cb6549c2d24c4243da79763ba652479
	tmp/cache/assets/development/sprockets/4f4591b33b2be9485400c80966dd58bf
	tmp/cache/assets/development/sprockets/5b31390bb454d608e3d9f5dd7ebbf808
	tmp/cache/assets/development/sprockets/5bc75f5b79f9d7551bc540f81402af84
	tmp/cache/assets/development/sprockets/5bd723dac18c35ae51e2e0ba9954947e
	tmp/cache/assets/development/sprockets/5d8bc18575bb0ae7904fe4144cc6d423
	tmp/cache/assets/development/sprockets/63bd143b37246159bd2d974ad6573d02
	tmp/cache/assets/development/sprockets/64f6756df93c2ac7b6e136b7378b441f
	tmp/cache/assets/development/sprockets/6de82b9fa690e9e4e814b407a8bfaf33
	tmp/cache/assets/development/sprockets/6ea09f0907882c2a82218e80b7381529
	tmp/cache/assets/development/sprockets/6ef0a6f6318fda1b3c170c42d6ede0ef
	tmp/cache/assets/development/sprockets/738341bb7a4ae882f39c1c3d72220a4b
	tmp/cache/assets/development/sprockets/74141256200310c12d46dfcaf3360c05
	tmp/cache/assets/development/sprockets/77f658a07de31d247c118de3fbbaea3f
	tmp/cache/assets/development/sprockets/7a486bdb70be37fb4793b927175b1b65
	tmp/cache/assets/development/sprockets/7b0853c653814e85faceace3dc5e36a3
	tmp/cache/assets/development/sprockets/8286a78218b44b7d32827ef795c711d6
	tmp/cache/assets/development/sprockets/83b0d51a49855cd78b73f19011131cbe
	tmp/cache/assets/development/sprockets/870f717afbdf9b3d7eaff7b187afb49f
	tmp/cache/assets/development/sprockets/8981a081b547e0859cfbbe9438153ed6
	tmp/cache/assets/development/sprockets/8b1c086e64c3d88e866f9fe8488f8270
	tmp/cache/assets/development/sprockets/8b51a427d562336e0fb818289c7f89af
	tmp/cache/assets/development/sprockets/8d1be0152aba8c4f086907b97d593e6a
	tmp/cache/assets/development/sprockets/8e6cd55fb56c16dad5bcffb1a6f95f8a
	tmp/cache/assets/development/sprockets/8ef71fb58a17bbe20d8b65deb9e2c687
	tmp/cache/assets/development/sprockets/8eff7fbda4cfd47fe8f58dbdeb3c0509
	tmp/cache/assets/development/sprockets/952370fa2fe1da8f1ad9f9247a31b70a
	tmp/cache/assets/development/sprockets/975e73ae12c77947ba11420f08e6a2b7
	tmp/cache/assets/development/sprockets/97e53b894e706833a4f6cf260c7c4f45
	tmp/cache/assets/development/sprockets/9a8915b04968f3912ab26743830c3075
	tmp/cache/assets/development/sprockets/9ab6faaac9288d228ccceab4b31d58fc
	tmp/cache/assets/development/sprockets/9bbf407d4cf449bf962f397c70a9392d
	tmp/cache/assets/development/sprockets/9dfaf816b26ca5284e7b319af87e20fc
	tmp/cache/assets/development/sprockets/a931e4fa987b75ba0d9fac3622f0254f
	tmp/cache/assets/development/sprockets/add389d9c58a084effbb8c274c9e6745
	tmp/cache/assets/development/sprockets/b32827ffcb1c666c2322049556d23ade
	tmp/cache/assets/development/sprockets/b3b3952cd5e85bd2c61aeac8c2259926
	tmp/cache/assets/development/sprockets/b4c66a5c2c24501f63a53566dea2f45f
	tmp/cache/assets/development/sprockets/b572c68731af119d409dec6203140188
	tmp/cache/assets/development/sprockets/ba321e7c1314a449e723e9c165ea917b
	tmp/cache/assets/development/sprockets/ba7bd55c92e289f66ab0f306704708d9
	tmp/cache/assets/development/sprockets/c2219b39152e6315d28703dcaacb697e
	tmp/cache/assets/development/sprockets/c38fd401489a552f8716adf4aedaa325
	tmp/cache/assets/development/sprockets/c7fd1a13f18aa2371d2e639b1a5392b5
	tmp/cache/assets/development/sprockets/c8b845a1eb6ceed64bf8e28c7c83b1b7
	tmp/cache/assets/development/sprockets/cc26250b4afe70bab0df989c64ba871c
	tmp/cache/assets/development/sprockets/cd4ce311439f9eb5839a78f9799b52bf
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/d1ff5c9c76b15bddcf74023abc92acc7
	tmp/cache/assets/development/sprockets/d40adbd22918ccaea7f51931fc41cf47
	tmp/cache/assets/development/sprockets/d46cdee9267251136f40ff0854c03e12
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/development/sprockets/d9102f346804faa6e6f4f01cd8184c4e
	tmp/cache/assets/development/sprockets/da3c0d3ac965455ec35d58669a3d2bcd
	tmp/cache/assets/development/sprockets/da64bc76d7c7196c317b1bcdb0c32b65
	tmp/cache/assets/development/sprockets/db89b9c6764ab21284e2dbb5a7c4d982
	tmp/cache/assets/development/sprockets/dd89ae766e94b4793c120ab7a54ef9ce
	tmp/cache/assets/development/sprockets/e171491d5c42c8752c7258ac8a074266
	tmp/cache/assets/development/sprockets/e72c8106269c820909d794f83092ce4d
	tmp/cache/assets/development/sprockets/ea31e73c6e3063af3912f075973f440a
	tmp/cache/assets/development/sprockets/ea9f978c58d395e84b94e07b5b643d28
	tmp/cache/assets/development/sprockets/ed81db2922887a2e3c3ddf40507967fb
	tmp/cache/assets/development/sprockets/ed9fdc69b0053a1a9075a0f2319f3ecd
	tmp/cache/assets/development/sprockets/eebb57be1bb36a6b79e7110d3b127f4e
	tmp/cache/assets/development/sprockets/efa2ad633bb6171ba5aaf06948f7c7cc
	tmp/cache/assets/development/sprockets/f0c47480205102b519ab1ae07b59c9c1
	tmp/cache/assets/development/sprockets/f70b34d63193792b0c6458cb636099c0
	tmp/cache/assets/development/sprockets/f7714fece21614b29bb2c2087bd645d4
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/development/sprockets/f8cdbfb633645c6110810e909fff6ec9