Test
Merge branch 'master' of https://github.com/nikneroz/bab

Conflicts:
	.idea/.generators
	.idea/.name
	.idea/.rakeTasks
	.idea/dataSources.xml
	.idea/dictionaries/dionysus.xml
	.idea/encodings.xml
	.idea/erostov.iml
	.idea/misc.xml
	.idea/modules.xml
	.idea/scopes/scope_settings.xml
	.idea/vcs.xml
	.idea/workspace.xml
	Gemfile
	Gemfile.lock
	README
	README.rdoc
	Rakefile
	app/assets/images/1.jpg
	app/assets/images/1.tif
	app/assets/images/12345.png
	app/assets/images/1444.jpg
	app/assets/images/1671.jpg
	app/assets/images/2.jpg
	app/assets/images/3.jpg
	app/assets/images/4.jpg
	app/assets/images/5.jpg
	app/assets/images/575.JPG
	app/assets/images/575.jpg
	app/assets/images/876.jpg
	app/assets/images/885.jpg
	app/assets/images/adress.png
	app/assets/images/auto.png
	app/assets/images/blank.gif
	app/assets/images/bludo.png
	app/assets/images/camera-loader.gif
	app/assets/images/camera_skins.png
	app/assets/images/cart1.png
	app/assets/images/clock.png
	app/assets/images/dog.jpg
	app/assets/images/e-mail.png
	app/assets/images/erostov.png
	app/assets/images/extra-services.png
	app/assets/images/facebook.png
	app/assets/images/flat(1).jpg
	app/assets/images/flat_nil.png
	app/assets/images/freeze.jpg
	app/assets/images/groups.png
	app/assets/images/holodilnik.gif
	app/assets/images/info.png
	app/assets/images/internet.gif
	app/assets/images/internet.jpg
	app/assets/images/jivnost.gif
	app/assets/images/konder.gif
	app/assets/images/korzina.png
	app/assets/images/korzina_2.png
	app/assets/images/korzina_3.png
	app/assets/images/kurenie.gif
	app/assets/images/kv.jpg
	app/assets/images/left_nav.png
	app/assets/images/lift.gif
	app/assets/images/lift.jpg
	app/assets/images/logo.gif
	app/assets/images/main-bg.png
	app/assets/images/microwave.jpg
	app/assets/images/obschepit_top.png
	app/assets/images/obschepit_top_2.png
	app/assets/images/obschepit_top_3.png
	app/assets/images/parking.jpg
	app/assets/images/parking.png
	app/assets/images/parkovka.gif
	app/assets/images/phone.png
	app/assets/images/picachoose/basic.png
	app/assets/images/picachoose/fastf.png
	app/assets/images/picachoose/loading.gif
	app/assets/images/picachoose/next-horizontal.png
	app/assets/images/picachoose/next-vertical.png
	app/assets/images/picachoose/next.png
	app/assets/images/picachoose/pause.png
	app/assets/images/picachoose/play.png
	app/assets/images/picachoose/prev-horizontal.png
	app/assets/images/picachoose/prev-vertical.png
	app/assets/images/picachoose/prev.png
	app/assets/images/picachoose/rewind.png
	app/assets/images/plane.png
	app/assets/images/price.png
	app/assets/images/rails.png
	app/assets/images/reklama.png
	app/assets/images/reklama_1.jpg
	app/assets/images/reklama_2.jpg
	app/assets/images/right_nav.png
	app/assets/images/saite.png
	app/assets/images/search_button.png
	app/assets/images/sigareta.jpg
	app/assets/images/sight-image.jpg
	app/assets/images/split.jpg
	app/assets/images/stiralnaya.jpg
	app/assets/images/stirka.gif
	app/assets/images/test1.jpg
	app/assets/images/test2.jpg
	app/assets/images/test3.jpg
	app/assets/images/test4.jpg
	app/assets/images/test5.jpg
	app/assets/images/test6.jpg
	app/assets/images/train.png
	app/assets/images/twitter.png
	app/assets/images/type.png
	app/assets/images/utug.gif
	app/assets/images/utyg.jpg
	app/assets/images/weather.png
	app/assets/images/webpage.png
	app/assets/javascripts/admin.js.coffee
	app/assets/javascripts/application.js
	app/assets/javascripts/coda.js
	app/assets/javascripts/conveniences.js.coffee
	app/assets/javascripts/flat_conveniences.js.coffee
	app/assets/javascripts/flat_reservations.js.coffee
	app/assets/javascripts/flats.js.coffee
	app/assets/javascripts/galleria-1.2.9.min.js
	app/assets/javascripts/jquery.simpleWeather-2.1.1.min.js
	app/assets/javascripts/personal.js.coffee
	app/assets/javascripts/reserved_flats.js.coffee
	app/assets/javascripts/sessions.js.coffee
	app/assets/javascripts/store.js
	app/assets/javascripts/users.js.coffee
	app/assets/javascripts/yandex_map.js
	app/assets/stylesheets/admin.css.scss
	app/assets/stylesheets/application.css
	app/assets/stylesheets/bootstrap_and_overrides.css.scss
	app/assets/stylesheets/carts.css.scss
	app/assets/stylesheets/conveniences.css.scss
	app/assets/stylesheets/flat_conveniences.css.scss
	app/assets/stylesheets/flat_reservations.css.scss
	app/assets/stylesheets/flats.css.scss
	app/assets/stylesheets/galleries.css.scss
	app/assets/stylesheets/personal.css.scss
	app/assets/stylesheets/reserved_flats.css.scss
	app/assets/stylesheets/scaffolds.css.scss
	app/assets/stylesheets/sessions.css.scss
	app/assets/stylesheets/store.css.scss
	app/assets/stylesheets/store.css.scss~
	app/assets/stylesheets/users.css.scss
	app/controllers/admin_controller.rb
	app/controllers/application_controller.rb
	app/controllers/carts_controller.rb
	app/controllers/conveniences_controller.rb
	app/controllers/flat_conveniences_controller.rb
	app/controllers/flat_reservations_controller.rb
	app/controllers/flats_controller.rb
	app/controllers/galleries_controller.rb
	app/controllers/personal_controller.rb
	app/controllers/reserved_flats_controller.rb
	app/controllers/sessions_controller.rb
	app/controllers/store_controller.rb
	app/controllers/users_controller.rb
	app/helpers/admin_helper.rb
	app/helpers/application_helper.rb
	app/helpers/carts_helper.rb
	app/helpers/conveniences_helper.rb
	app/helpers/flat_conveniences_helper.rb
	app/helpers/flat_reservations_helper.rb
	app/helpers/flats_helper.rb
	app/helpers/galleries_helper.rb
	app/helpers/personal_helper.rb
	app/helpers/reserved_flats_helper.rb
	app/helpers/sessions_helper.rb
	app/helpers/store_helper.rb
	app/helpers/users_helper.rb
	app/mailers/.gitkeep
	app/mailers/order_notifier.rb
	app/models/.gitkeep
	app/models/cart.rb
	app/models/convenience.rb
	app/models/flat.rb
	app/models/flat_convenience.rb
	app/models/flat_reservation.rb
	app/models/gallery.rb
	app/models/reserved_flat.rb
	app/models/user.rb
	app/uploaders/avatar_uploader.rb
	app/views/admin/index.html.erb
	app/views/carts/_form.html.erb
	app/views/carts/edit.html.erb
	app/views/carts/index.html.erb
	app/views/carts/new.html.erb
	app/views/carts/show.html.erb
	app/views/conveniences/_form.html.erb
	app/views/conveniences/edit.html.erb
	app/views/conveniences/index.html.erb
	app/views/conveniences/new.html.erb
	app/views/conveniences/show.html.erb
	app/views/flat_conveniences/_form.html.erb
	app/views/flat_conveniences/edit.html.erb
	app/views/flat_conveniences/index.html.erb
	app/views/flat_conveniences/new.html.erb
	app/views/flat_conveniences/show.html.erb
	app/views/flat_reservations/_form.html.erb
	app/views/flat_reservations/edit.html.erb
	app/views/flat_reservations/index.html.erb
	app/views/flat_reservations/new.html.erb
	app/views/flat_reservations/show.html.erb
	app/views/flats/_form.html.erb
	app/views/flats/edit.html.erb
	app/views/flats/index.html.erb
	app/views/flats/new.html.erb
	app/views/flats/show.html.erb
	app/views/galleries/_form.html.erb
	app/views/galleries/new.html.erb
	app/views/layouts/application.html.haml
	app/views/layouts/side_menu.html.haml
	app/views/layouts/store_show.html.haml
	app/views/layouts/users_show.html.haml
	app/views/order_notifier/received.text.erb
	app/views/order_notifier/shipped.text.erb
	app/views/personal/new.html.erb
	app/views/personal/show.html.erb
	app/views/reserved_flats/_form.html.erb
	app/views/reserved_flats/edit.html.erb
	app/views/reserved_flats/index.html.erb
	app/views/reserved_flats/new.html.erb
	app/views/reserved_flats/show.html.erb
	app/views/sessions/create.html.erb
	app/views/sessions/destroy.html.erb
	app/views/sessions/new.html.haml
	app/views/store/_calendar.html.erb
	app/views/store/_flats_in_central_menu.html.haml
	app/views/store/_reservation.html.erb
	app/views/store/index.html.haml
	app/views/store/index.js.erb
	app/views/store/show.html.haml
	app/views/store/show.js.erb
	app/views/users/_form.html.erb
	app/views/users/_profile.html.haml
	app/views/users/edit.html.erb
	app/views/users/index.html.erb
	app/views/users/new.html.erb
	app/views/users/show.html.haml
	app/views/users/show.js.erb
	config.ru
	config/Gemfile
	config/application.rb
	config/boot.rb
	config/database.yml
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/backtrace_silencers.rb
	config/initializers/inflections.rb
	config/initializers/mime_types.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/initializers/wrap_parameters.rb
	config/locales/en.yml
	config/routes.rb
	db/migrate/20121002052939_create_flats.rb
	db/migrate/20121002055429_create_conveniences.rb
	db/migrate/20121002060441_create_flat_conveniences.rb
	db/migrate/20121009130349_add_column_to_flats.rb
	db/migrate/20121009141042_create_galleries.rb
	db/migrate/20121014061823_create_users.rb
	db/migrate/20121118134246_create_carts.rb
	db/migrate/20121118140533_create_flat_reservations.rb
	db/migrate/20121119050451_create_reserved_flats.rb
	db/schema.rb
	db/seeds.rb
	doc/README_FOR_APP
	lib/assets/.gitkeep
	lib/tasks/.gitkeep
	log/.gitkeep
	public/404.html
	public/422.html
	public/500.html
	public/favicon.ico
	public/galleria/themes/classic/classic-demo.html
	public/galleria/themes/classic/classic-loader.gif
	public/galleria/themes/classic/classic-map.png
	public/galleria/themes/classic/galleria.classic.css
	public/galleria/themes/classic/galleria.classic.js
	public/galleria/themes/classic/galleria.classic.min.js
	public/robots.txt
	public/uploads/flat/avatar/1/1.jpg
	public/uploads/flat/avatar/1/18_.jpg
	public/uploads/flat/avatar/1/25_.jpg
	public/uploads/flat/avatar/1/3.jpg
	public/uploads/flat/avatar/1/flat_1_.jpg
	public/uploads/flat/avatar/10/flat_nil.png
	public/uploads/flat/avatar/2/1.jpg
	public/uploads/flat/avatar/2/10.jpg
	public/uploads/flat/avatar/2/18_.jpg
	public/uploads/flat/avatar/2/flat_nil.png
	public/uploads/flat/avatar/3/sight-image.jpg
	public/uploads/gallery/avatar/1/1.jpg
	public/uploads/gallery/avatar/1/13.jpg
	public/uploads/gallery/avatar/1/2.jpg
	public/uploads/gallery/avatar/1/3.jpg
	public/uploads/gallery/avatar/1/6.jpg
	public/uploads/gallery/avatar/10/2.jpg
	public/uploads/gallery/avatar/11/3.jpg
	public/uploads/gallery/avatar/12/4.jpg
	public/uploads/gallery/avatar/13/5.jpg
	public/uploads/gallery/avatar/14/6.jpg
	public/uploads/gallery/avatar/15/8.jpg
	public/uploads/gallery/avatar/16/9.jpg
	public/uploads/gallery/avatar/17/11.jpg
	public/uploads/gallery/avatar/18/12.jpg
	public/uploads/gallery/avatar/19/13.jpg
	public/uploads/gallery/avatar/2/10.jpg
	public/uploads/gallery/avatar/2/14.jpg
	public/uploads/gallery/avatar/2/3.jpg
	public/uploads/gallery/avatar/2/4.jpg
	public/uploads/gallery/avatar/2/6.jpg
	public/uploads/gallery/avatar/20/29_.jpg
	public/uploads/gallery/avatar/3/13.jpg
	public/uploads/gallery/avatar/4/10.jpg
	public/uploads/gallery/avatar/4/20_.jpg
	public/uploads/gallery/avatar/5/12.jpg
	public/uploads/gallery/avatar/5/5.jpg
	public/uploads/gallery/avatar/6/8.jpg
	script/rails
	sqlite-jdbc-3.7.2.jar
	sqlitejdbc-v056.jar
	store.old.html.erb
	test/fixtures/.gitkeep
	test/fixtures/carts.yml
	test/fixtures/flat_reservations.yml
	test/fixtures/reserved_flats.yml
	test/functional/.gitkeep
	test/functional/carts_controller_test.rb
	test/functional/flat_reservations_controller_test.rb
	test/functional/order_notifier_test.rb
	test/functional/personal_controller_test.rb
	test/functional/reserved_flats_controller_test.rb
	test/integration/.gitkeep
	test/performance/browsing_test.rb
	test/test_helper.rb
	test/unit/.gitkeep
	test/unit/cart_test.rb
	test/unit/flat_reservation_test.rb
	test/unit/helpers/carts_helper_test.rb
	test/unit/helpers/flat_reservations_helper_test.rb
	test/unit/helpers/personal_helper_test.rb
	test/unit/helpers/reserved_flats_helper_test.rb
	test/unit/reserved_flat_test.rb
	tmp/cache/assets/C05/970/sprockets%2Fa95bf21996259257330f7822489d5723
	tmp/cache/assets/C10/D20/sprockets%2F7bd694797814d58692e64d3616842454
	tmp/cache/assets/C15/150/sprockets%2F129565e5116a531263ab919b9732e301
	tmp/cache/assets/C39/D40/sprockets%2Fb070187140d9af914b71f324311216b4
	tmp/cache/assets/C50/BA0/sprockets%2Fd4a01710428167b288635a9d9f0287b4
	tmp/cache/assets/C54/190/sprockets%2F044ce5ea7233a5905d19546379165f71
	tmp/cache/assets/C7C/9B0/sprockets%2F6e615a294139393e702d662ab7a550b6
	tmp/cache/assets/C84/990/sprockets%2F78b4d9812fc71e9ae4407112824840d5
	tmp/cache/assets/C87/850/sprockets%2F22d12f0d8484f2376579e1c0d753d458
	tmp/cache/assets/C8B/C00/sprockets%2F90c5945d88424a8b14d5560581fef353
	tmp/cache/assets/C92/8C0/sprockets%2Fb2554da885483b54f225c268d9586f08
	tmp/cache/assets/C93/870/sprockets%2F1bf5400a21580bb5154cf57065a2d370
	tmp/cache/assets/CAB/3E0/sprockets%2F94bf00b9c858bd9653518753a10a261a
	tmp/cache/assets/CB0/700/sprockets%2F922b6022544443e349b49325d36ddfdf
	tmp/cache/assets/CB0/D60/sprockets%2F0335d87ebd93523744c2fec4426f4432
	tmp/cache/assets/CB1/7E0/sprockets%2F27a3bb702793a9b29546e8b5139b63a5
	tmp/cache/assets/CB2/8B0/sprockets%2F86d4313277257a58599abeab93811da0
	tmp/cache/assets/CB3/120/sprockets%2Fa93851f715b68d8b521526b52f25be72
	tmp/cache/assets/CB5/9E0/sprockets%2Fe459168835a5f27b832ace20874f7c10
	tmp/cache/assets/CBC/EF0/sprockets%2F8e4c6782b089a9c5610d009246dd77a9
	tmp/cache/assets/CBF/AA0/sprockets%2F187345ef10d891988fac9a68090b4e33
	tmp/cache/assets/CC4/DB0/sprockets%2F0dace1553233f21414cc5b1133eb4973
	tmp/cache/assets/CC7/D10/sprockets%2F9943636d12961b36fee38148d48cf94c
	tmp/cache/assets/CC8/C70/sprockets%2Fe33d218129a5ef11686ae1099aa110b0
	tmp/cache/assets/CC9/320/sprockets%2F77a9d67278613aa7999e5c55bf806b51
	tmp/cache/assets/CD6/2D0/sprockets%2Fa2d8932a025743edd30c48b8570621fc
	tmp/cache/assets/CD7/6F0/sprockets%2Fbd3936370d0f952ada5774e2230046ed
	tmp/cache/assets/CD8/2C0/sprockets%2F076350c29e71e6a10f003ef5b4c9167f
	tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/CD8/8B0/sprockets%2F2828a05f3c23b844426d96225dbc3fe0
	tmp/cache/assets/CDD/450/sprockets%2F8b74664b0e534018a47793ca54d4b5da
	tmp/cache/assets/CDF/400/sprockets%2F12397a1b2ce977fa06390e479673c1aa
	tmp/cache/assets/CDF/F70/sprockets%2Fb5e0e76b0802e0528767fab429c80e36
	tmp/cache/assets/CE0/920/sprockets%2F228e7035d5e9432fb7a494e31a2a928c
	tmp/cache/assets/CE0/A60/sprockets%2F78b8e22572ea0a806587950cadd4a651
	tmp/cache/assets/CE2/2C0/sprockets%2F883a8d90fac2941510eaff0f74750635
	tmp/cache/assets/CE2/660/sprockets%2Ff6450ef4653c19008a870be83acc4954
	tmp/cache/assets/CE4/720/sprockets%2F52d4980a80a5941750a46c99ad367dea
	tmp/cache/assets/CE8/240/sprockets%2F11ad98b57d93670f817b220f8e4881bc
	tmp/cache/assets/CE8/840/sprockets%2F67eb859757910e1082d8534cbce75a2a
	tmp/cache/assets/CEC/A40/sprockets%2F7fb72552eb2155937dc95269f6d0ac74
	tmp/cache/assets/CEC/BF0/sprockets%2F08383b977d77ec8450f11cf35db57a37
	tmp/cache/assets/CEF/AD0/sprockets%2F4c90331d97054a8f89a821fff692a39c
	tmp/cache/assets/CF8/DB0/sprockets%2F582f9754a6c812875ec18ff066ac47f7
	tmp/cache/assets/CFA/E10/sprockets%2F7638cce77f5e9618bdc24c244889a555
	tmp/cache/assets/CFE/B50/sprockets%2Fd4142b04c478f612ccd1cf7202708c3d
	tmp/cache/assets/D00/AC0/sprockets%2F7d224f323d4c67cbb1f60d0285171af4
	tmp/cache/assets/D01/9E0/sprockets%2Ffbb09353fe014ed03e37333d07b2c269
	tmp/cache/assets/D02/0A0/sprockets%2F4ad413f3e3326481d2f5f9327bbd0e12
	tmp/cache/assets/D02/F60/sprockets%2F2614d0b5c8e70e8d0b4bf508c180446a
	tmp/cache/assets/D03/670/sprockets%2F6c0f2a2c7346b84a92e2cb81473e251b
	tmp/cache/assets/D04/960/sprockets%2Ff6995b3c699c49728ae5c3f1780e86d6
	tmp/cache/assets/D04/980/sprockets%2F60a76b720575acc0c7dd82b6e70330f5
	tmp/cache/assets/D04/D20/sprockets%2F943eea123cc7114a61f8cc9a415824f0
	tmp/cache/assets/D08/530/sprockets%2Fdc41ee733881f748b5c6b32b1dd12721
	tmp/cache/assets/D08/550/sprockets%2F031dac6a45f74b37f0d774f067d543c1
	tmp/cache/assets/D09/800/sprockets%2F07bcc624860b533348fb74bbe5a983a1
	tmp/cache/assets/D0B/6F0/sprockets%2F1d1ed19db0c59892d6d2a9c01055709d
	tmp/cache/assets/D0D/B40/sprockets%2F2687574a66cbc092aea715f07d51f62a
	tmp/cache/assets/D0E/390/sprockets%2F20b70736230ea43c0667bed5e9997ccb
	tmp/cache/assets/D11/470/sprockets%2F874f196ab602286a51c416e3fe76ac5c
	tmp/cache/assets/D15/090/sprockets%2F35788d6dabe3e4f461e2a5f2c3186715
	tmp/cache/assets/D15/880/sprockets%2Ff54481127b6576d33e6c2dab8657e3db
	tmp/cache/assets/D17/8C0/sprockets%2F0d6c3da429178eb88bfc857f7b463050
	tmp/cache/assets/D1B/A70/sprockets%2F9af02d66b61a491c659fa825c519f49c
	tmp/cache/assets/D1B/E70/sprockets%2Fa5c391e94fb89916191c8be55e403ce3
	tmp/cache/assets/D1E/3E0/sprockets%2Ffe81fe51a9279a0c82f77d254f694c04
	tmp/cache/assets/D1E/C60/sprockets%2F69596dcdc87f640ef13934c324ae94a3
	tmp/cache/assets/D28/2D0/sprockets%2F1e45b2d4d926dfa4aa211f81d120a907
	tmp/cache/assets/D29/550/sprockets%2F29737cf6963f8edb933f2505be464e8d
	tmp/cache/assets/D29/6F0/sprockets%2Fb0b823ccf4b5aba48b159f0a07225229
	tmp/cache/assets/D2A/090/sprockets%2F981fdf59c6c819da5a85424ee749e704
	tmp/cache/assets/D2B/030/sprockets%2F2eae6db054ae185bc173172bc60c7820
	tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/D37/D60/sprockets%2Fb5d32918d3ee59fca2d82a292302f5a1
	tmp/cache/assets/D3A/A90/sprockets%2F3ecc85aff4d4243e2e5603ab35e63608
	tmp/cache/assets/D3A/BE0/sprockets%2F73d5b3d4a4584cbe9dfa3937b134c007
	tmp/cache/assets/D3B/020/sprockets%2F81f1feb6d554574bbb702c623fdc6415
	tmp/cache/assets/D3C/9C0/sprockets%2Fc82055edcda838e710959bcbd03831a6
	tmp/cache/assets/D3C/CA0/sprockets%2Fc34501a7e3e6f8b63b6111f49ab943ef
	tmp/cache/assets/D3D/E20/sprockets%2Fa201249d48e8d716efe0f17ad7e21d09
	tmp/cache/assets/D43/4D0/sprockets%2F44fd5b456c6aef29020f8c765de4314e
	tmp/cache/assets/D48/540/sprockets%2F8b8a9c43d2f5a2f2177e4037e6f526df
	tmp/cache/assets/D4D/7E0/sprockets%2F1229a28f3ce177f68b0a86916ece2f8f
	tmp/cache/assets/D4D/BD0/sprockets%2F7790f3efd559c7e3052df4f2a9c109d5
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/D4F/290/sprockets%2F62c22dd509d4f77afd8d1e7608f84f44
	tmp/cache/assets/D54/FA0/sprockets%2F62b7f4fe35faf9c8518cd20326e398e9
	tmp/cache/assets/D57/6C0/sprockets%2F8710b9585f186f2f38f06ebdd4ff5e74
	tmp/cache/assets/D58/510/sprockets%2F8b7425ed69e505e071b89738d5edcdf8
	tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/D64/990/sprockets%2Fc6a1a381cea917925217daf318aeaf71
	tmp/cache/assets/D66/E60/sprockets%2F85ae64edf528ce6e981889f3f3c285d9
	tmp/cache/assets/D67/520/sprockets%2F2de063a04fdea3162a8b7c172b9694ed
	tmp/cache/assets/D68/C40/sprockets%2Fd942271d4f9c8bd607c02effc0a23e24
	tmp/cache/assets/D69/C40/sprockets%2Fd2dc36483a865fa84c0f6bf1d23228bb
	tmp/cache/assets/D6A/DD0/sprockets%2F8b312d1484aaab9fdf38215cca5b0989
	tmp/cache/assets/D6E/FA0/sprockets%2Fc91f38d08128d8edf15c8e2703dd0fa1
	tmp/cache/assets/D71/CC0/sprockets%2F005ebed74ad702627e746c9d6c30d6ff
	tmp/cache/assets/D74/E30/sprockets%2F491cdd0ce60f3df20b29cd098f8d4773
	tmp/cache/assets/D78/9A0/sprockets%2Fea6ab7f5af91372551af680f6097f6ea
	tmp/cache/assets/D78/D40/sprockets%2F1b6efd2ff5f4179d8943a3470afc660e
	tmp/cache/assets/D83/BA0/sprockets%2Fba051ae3b64accba0915e35a3964e2c2
	tmp/cache/assets/D85/4C0/sprockets%2Faa350aa8d4515eca032a1e81d8553edb
	tmp/cache/assets/D94/0F0/sprockets%2Fd8f656c52e4761cf020cdd2a35d2abb8
	tmp/cache/assets/D96/350/sprockets%2F29c28e723f2e21b6ebf004ac0e5c6ec9
	tmp/cache/assets/D96/DC0/sprockets%2Faa35e9bd6a61904fb8ef284ac15dc025
	tmp/cache/assets/D99/730/sprockets%2Fefd3b6bf38c5f0520db1d4e570d8e514
	tmp/cache/assets/D99/7B0/sprockets%2F9aafd6004ac745565141eff92bb4ade6
	tmp/cache/assets/DA0/BA0/sprockets%2F91b37f4402fce9e32d5645ceb1fd07de
	tmp/cache/assets/DA0/DD0/sprockets%2F4c4eb877406f45cc9bef4caa4a0479e0
	tmp/cache/assets/DA1/B50/sprockets%2Faefb35bd7dd5c2fd877271ac7620e671
	tmp/cache/assets/DA4/460/sprockets%2F977ead1d20bc9f7e1c191bd4348f9e3a
	tmp/cache/assets/DAB/360/sprockets%2Fe69ee81e006ccdd6bc3d8481ee97146c
	tmp/cache/assets/DAB/E10/sprockets%2F95aecc1f2efd4e7f5759c42228d3ae74
	tmp/cache/assets/DAD/960/sprockets%2Ff58695caa371435bf6b77e18bbda69fd
	tmp/cache/assets/DAE/F80/sprockets%2Fcf92da27e7cdebbdc1682862984db836
	tmp/cache/assets/DB1/560/sprockets%2Fb0cd641e35523decc64cd73dd00a2ac1
	tmp/cache/assets/DBB/1C0/sprockets%2F3d9f29b5a840bfe95d9586e7db3f39bf
	tmp/cache/assets/DC2/F40/sprockets%2F80e1da1b76df6cee1d9c1144f5b23c4b
	tmp/cache/assets/DC5/610/sprockets%2Fed6fdc2e1daa7850b8611deb562b67b0
	tmp/cache/assets/DC5/C90/sprockets%2Fb3b980d46447e2a4f5110cc5e5edeaeb
	tmp/cache/assets/DCA/480/sprockets%2Fef513540f9efcae4a750eb9bb00bc677
	tmp/cache/assets/DCC/D70/sprockets%2F68a0bcd6fdbec55a57544c2e5e7c371a
	tmp/cache/assets/DD1/740/sprockets%2Fe2e8f7f4c2e46b20bbaa95d67e83c41e
	tmp/cache/assets/DD3/EF0/sprockets%2F224f9b81ee6c3a8f0fa9e6e5c3f1d5c2
	tmp/cache/assets/DD3/FA0/sprockets%2F4db8b3b1ffb746e8cae16494fed680a2
	tmp/cache/assets/DD4/AE0/sprockets%2F5fe287f4ea5c6bf67db254f31cc32e6c
	tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/DE6/710/sprockets%2F14b4d40a1910cba3c3f2bdca2ff58a8f
	tmp/cache/assets/DEB/750/sprockets%2F34a2eeac3b6eed1838ece50c1525a3bb
	tmp/cache/assets/DF1/710/sprockets%2F0f8aa08bcb16235a9f63bb55b7cdaad8
	tmp/cache/assets/DF2/3B0/sprockets%2F096ebb62a32e6a7504cdbbd3c9b8a3bf
	tmp/cache/assets/DF2/930/sprockets%2Fdee83eea0aeca1a948212c59db3ec523
	tmp/cache/assets/DFC/470/sprockets%2F8a0e7cc1ca5e1af0b1a30ac42ea00e1a
	tmp/cache/assets/DFE/D20/sprockets%2F8449efde0ba4d7aef0cd1d5b95c1b880
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/E07/600/sprockets%2F7e2d7dd531ce52683e7bea3deafc69e3
	tmp/cache/assets/E0B/A20/sprockets%2F0dcccf3cf5085ef5fb5e5a857889dad0
	tmp/cache/assets/E19/2A0/sprockets%2F10fcfbe6ebae11a40c8eac41939a1b9a
	tmp/cache/assets/E22/980/sprockets%2Fe7acfa2622bdd8b22ad5e8f5ddb4217a
	tmp/cache/assets/E2E/9C0/sprockets%2F713cf9e8eed3b4b50ef5ae9eb06fcb12
	tmp/cache/assets/E32/E20/sprockets%2Fedbe667dbcadf4bf72c873603ddd9c04
	tmp/cache/assets/E36/C60/sprockets%2F8fe0f8e49aad32dd96c9713e1eabe1df
	tmp/cache/assets/E3E/0B0/sprockets%2Ffab860891fba79afd0e86cfdebc27d86
	tmp/cache/assets/E55/6E0/sprockets%2F9d35cd8fa6cdc1810edbcfc1d35c71cb
	tmp/cache/assets/EBD/7F0/sprockets%2Fc3fb3faaf9796afacf7c51ebbcae344e
	tmp/cache/sass/4faafae3aea39bfb21f97d9bbeea067456837876/admin.css.scssc
	tmp/cache/sass/4faafae3aea39bfb21f97d9bbeea067456837876/bootstrap_and_overrides.css.scssc
	tmp/cache/sass/4faafae3aea39bfb21f97d9bbeea067456837876/carts.css.scssc
	tmp/cache/sass/4faafae3aea39bfb21f97d9bbeea067456837876/conveniences.css.scssc
	tmp/cache/sass/4faafae3aea39bfb21f97d9bbeea067456837876/flat_conveniences.css.scssc
	tmp/cache/sass/4faafae3aea39bfb21f97d9bbeea067456837876/flat_reservations.css.scssc
	tmp/cache/sass/4faafae3aea39bfb21f97d9bbeea067456837876/flats.css.scssc
	tmp/cache/sass/4faafae3aea39bfb21f97d9bbeea067456837876/galleries.css.scssc
	tmp/cache/sass/4faafae3aea39bfb21f97d9bbeea067456837876/personal.css.scssc
	tmp/cache/sass/4faafae3aea39bfb21f97d9bbeea067456837876/reserved_flats.css.scssc
	tmp/cache/sass/4faafae3aea39bfb21f97d9bbeea067456837876/scaffolds.css.scssc
	tmp/cache/sass/4faafae3aea39bfb21f97d9bbeea067456837876/sessions.css.scssc
	tmp/cache/sass/4faafae3aea39bfb21f97d9bbeea067456837876/store.css.scssc
	tmp/cache/sass/4faafae3aea39bfb21f97d9bbeea067456837876/users.css.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_accordion.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_alerts.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_breadcrumbs.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_button-groups.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_buttons.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_carousel.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_close.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_code.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_component-animations.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_dropdowns.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_forms.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_grid.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_hero-unit.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_labels-badges.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_layouts.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_media.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_mixins.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_modals.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_navbar.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_navs.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_pager.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_pagination.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_popovers.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_progress-bars.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_reset.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_responsive-1200px-min.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_responsive-767px-max.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_responsive-768px-979px.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_responsive-navbar.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_responsive-utilities.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_scaffolding.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_sprites.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_tables.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_thumbnails.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_tooltip.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_type.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_utilities.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_variables.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_wells.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/bootstrap.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/responsive.scssc
	tmp/cache/sass/eef8979de6375f91caa9bea15bbc8e7bd62d448f/bootstrap-responsive.scssc
	tmp/cache/sass/eef8979de6375f91caa9bea15bbc8e7bd62d448f/bootstrap.scssc
	tmp/pids/server.pid
	vendor/assets/javascripts/.gitkeep
	vendor/assets/stylesheets/.gitkeep
	vendor/plugins/.gitkeep
	xerial-sqlite-license.txt
	zentus-sqlite-license.txt
Merge branch 'master' of https://github.com/nikneroz/bab

Conflicts:
	tmp/cache/assets/C05/970/sprockets%2Fa95bf21996259257330f7822489d5723
	tmp/cache/assets/C10/D20/sprockets%2F7bd694797814d58692e64d3616842454
	tmp/cache/assets/C15/150/sprockets%2F129565e5116a531263ab919b9732e301
	tmp/cache/assets/C39/D40/sprockets%2Fb070187140d9af914b71f324311216b4
	tmp/cache/assets/C50/BA0/sprockets%2Fd4a01710428167b288635a9d9f0287b4
	tmp/cache/assets/C54/190/sprockets%2F044ce5ea7233a5905d19546379165f71
	tmp/cache/assets/C7C/9B0/sprockets%2F6e615a294139393e702d662ab7a550b6
	tmp/cache/assets/C84/990/sprockets%2F78b4d9812fc71e9ae4407112824840d5
	tmp/cache/assets/C87/850/sprockets%2F22d12f0d8484f2376579e1c0d753d458
	tmp/cache/assets/C8B/C00/sprockets%2F90c5945d88424a8b14d5560581fef353
	tmp/cache/assets/C92/8C0/sprockets%2Fb2554da885483b54f225c268d9586f08
	tmp/cache/assets/C93/870/sprockets%2F1bf5400a21580bb5154cf57065a2d370
	tmp/cache/assets/CAB/3E0/sprockets%2F94bf00b9c858bd9653518753a10a261a
	tmp/cache/assets/CB0/700/sprockets%2F922b6022544443e349b49325d36ddfdf
	tmp/cache/assets/CB0/D60/sprockets%2F0335d87ebd93523744c2fec4426f4432
	tmp/cache/assets/CB1/7E0/sprockets%2F27a3bb702793a9b29546e8b5139b63a5
	tmp/cache/assets/CB2/8B0/sprockets%2F86d4313277257a58599abeab93811da0
	tmp/cache/assets/CB3/120/sprockets%2Fa93851f715b68d8b521526b52f25be72
	tmp/cache/assets/CB5/9E0/sprockets%2Fe459168835a5f27b832ace20874f7c10
	tmp/cache/assets/CBC/EF0/sprockets%2F8e4c6782b089a9c5610d009246dd77a9
	tmp/cache/assets/CBF/AA0/sprockets%2F187345ef10d891988fac9a68090b4e33
	tmp/cache/assets/CC4/DB0/sprockets%2F0dace1553233f21414cc5b1133eb4973
	tmp/cache/assets/CC7/D10/sprockets%2F9943636d12961b36fee38148d48cf94c
	tmp/cache/assets/CC8/C70/sprockets%2Fe33d218129a5ef11686ae1099aa110b0
	tmp/cache/assets/CC9/320/sprockets%2F77a9d67278613aa7999e5c55bf806b51
	tmp/cache/assets/CD6/2D0/sprockets%2Fa2d8932a025743edd30c48b8570621fc
	tmp/cache/assets/CD7/6F0/sprockets%2Fbd3936370d0f952ada5774e2230046ed
	tmp/cache/assets/CD8/2C0/sprockets%2F076350c29e71e6a10f003ef5b4c9167f
	tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/CD8/8B0/sprockets%2F2828a05f3c23b844426d96225dbc3fe0
	tmp/cache/assets/CDD/450/sprockets%2F8b74664b0e534018a47793ca54d4b5da
	tmp/cache/assets/CDF/400/sprockets%2F12397a1b2ce977fa06390e479673c1aa
	tmp/cache/assets/CDF/F70/sprockets%2Fb5e0e76b0802e0528767fab429c80e36
	tmp/cache/assets/CE0/920/sprockets%2F228e7035d5e9432fb7a494e31a2a928c
	tmp/cache/assets/CE0/A60/sprockets%2F78b8e22572ea0a806587950cadd4a651
	tmp/cache/assets/CE2/2C0/sprockets%2F883a8d90fac2941510eaff0f74750635
	tmp/cache/assets/CE2/660/sprockets%2Ff6450ef4653c19008a870be83acc4954
	tmp/cache/assets/CE4/720/sprockets%2F52d4980a80a5941750a46c99ad367dea
	tmp/cache/assets/CE8/240/sprockets%2F11ad98b57d93670f817b220f8e4881bc
	tmp/cache/assets/CE8/840/sprockets%2F67eb859757910e1082d8534cbce75a2a
	tmp/cache/assets/CEC/A40/sprockets%2F7fb72552eb2155937dc95269f6d0ac74
	tmp/cache/assets/CEC/BF0/sprockets%2F08383b977d77ec8450f11cf35db57a37
	tmp/cache/assets/CEF/AD0/sprockets%2F4c90331d97054a8f89a821fff692a39c
	tmp/cache/assets/CF8/DB0/sprockets%2F582f9754a6c812875ec18ff066ac47f7
	tmp/cache/assets/CFA/E10/sprockets%2F7638cce77f5e9618bdc24c244889a555
	tmp/cache/assets/CFE/B50/sprockets%2Fd4142b04c478f612ccd1cf7202708c3d
	tmp/cache/assets/D00/AC0/sprockets%2F7d224f323d4c67cbb1f60d0285171af4
	tmp/cache/assets/D01/9E0/sprockets%2Ffbb09353fe014ed03e37333d07b2c269
	tmp/cache/assets/D02/0A0/sprockets%2F4ad413f3e3326481d2f5f9327bbd0e12
	tmp/cache/assets/D02/F60/sprockets%2F2614d0b5c8e70e8d0b4bf508c180446a
	tmp/cache/assets/D03/670/sprockets%2F6c0f2a2c7346b84a92e2cb81473e251b
	tmp/cache/assets/D04/960/sprockets%2Ff6995b3c699c49728ae5c3f1780e86d6
	tmp/cache/assets/D04/980/sprockets%2F60a76b720575acc0c7dd82b6e70330f5
	tmp/cache/assets/D04/D20/sprockets%2F943eea123cc7114a61f8cc9a415824f0
	tmp/cache/assets/D08/530/sprockets%2Fdc41ee733881f748b5c6b32b1dd12721
	tmp/cache/assets/D08/550/sprockets%2F031dac6a45f74b37f0d774f067d543c1
	tmp/cache/assets/D09/800/sprockets%2F07bcc624860b533348fb74bbe5a983a1
	tmp/cache/assets/D0B/6F0/sprockets%2F1d1ed19db0c59892d6d2a9c01055709d
	tmp/cache/assets/D0D/B40/sprockets%2F2687574a66cbc092aea715f07d51f62a
	tmp/cache/assets/D0E/390/sprockets%2F20b70736230ea43c0667bed5e9997ccb
	tmp/cache/assets/D11/470/sprockets%2F874f196ab602286a51c416e3fe76ac5c
	tmp/cache/assets/D15/090/sprockets%2F35788d6dabe3e4f461e2a5f2c3186715
	tmp/cache/assets/D15/880/sprockets%2Ff54481127b6576d33e6c2dab8657e3db
	tmp/cache/assets/D17/8C0/sprockets%2F0d6c3da429178eb88bfc857f7b463050
	tmp/cache/assets/D1B/A70/sprockets%2F9af02d66b61a491c659fa825c519f49c
	tmp/cache/assets/D1B/E70/sprockets%2Fa5c391e94fb89916191c8be55e403ce3
	tmp/cache/assets/D1E/3E0/sprockets%2Ffe81fe51a9279a0c82f77d254f694c04
	tmp/cache/assets/D1E/C60/sprockets%2F69596dcdc87f640ef13934c324ae94a3
	tmp/cache/assets/D28/2D0/sprockets%2F1e45b2d4d926dfa4aa211f81d120a907
	tmp/cache/assets/D29/550/sprockets%2F29737cf6963f8edb933f2505be464e8d
	tmp/cache/assets/D29/6F0/sprockets%2Fb0b823ccf4b5aba48b159f0a07225229
	tmp/cache/assets/D2A/090/sprockets%2F981fdf59c6c819da5a85424ee749e704
	tmp/cache/assets/D2B/030/sprockets%2F2eae6db054ae185bc173172bc60c7820
	tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/D37/D60/sprockets%2Fb5d32918d3ee59fca2d82a292302f5a1
	tmp/cache/assets/D3A/A90/sprockets%2F3ecc85aff4d4243e2e5603ab35e63608
	tmp/cache/assets/D3A/BE0/sprockets%2F73d5b3d4a4584cbe9dfa3937b134c007
	tmp/cache/assets/D3B/020/sprockets%2F81f1feb6d554574bbb702c623fdc6415
	tmp/cache/assets/D3C/9C0/sprockets%2Fc82055edcda838e710959bcbd03831a6
	tmp/cache/assets/D3C/CA0/sprockets%2Fc34501a7e3e6f8b63b6111f49ab943ef
	tmp/cache/assets/D3D/E20/sprockets%2Fa201249d48e8d716efe0f17ad7e21d09
	tmp/cache/assets/D43/4D0/sprockets%2F44fd5b456c6aef29020f8c765de4314e
	tmp/cache/assets/D48/540/sprockets%2F8b8a9c43d2f5a2f2177e4037e6f526df
	tmp/cache/assets/D4D/7E0/sprockets%2F1229a28f3ce177f68b0a86916ece2f8f
	tmp/cache/assets/D4D/BD0/sprockets%2F7790f3efd559c7e3052df4f2a9c109d5
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/D4F/290/sprockets%2F62c22dd509d4f77afd8d1e7608f84f44
	tmp/cache/assets/D54/FA0/sprockets%2F62b7f4fe35faf9c8518cd20326e398e9
	tmp/cache/assets/D57/6C0/sprockets%2F8710b9585f186f2f38f06ebdd4ff5e74
	tmp/cache/assets/D58/510/sprockets%2F8b7425ed69e505e071b89738d5edcdf8
	tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/D64/990/sprockets%2Fc6a1a381cea917925217daf318aeaf71
	tmp/cache/assets/D66/E60/sprockets%2F85ae64edf528ce6e981889f3f3c285d9
	tmp/cache/assets/D67/520/sprockets%2F2de063a04fdea3162a8b7c172b9694ed
	tmp/cache/assets/D68/C40/sprockets%2Fd942271d4f9c8bd607c02effc0a23e24
	tmp/cache/assets/D69/C40/sprockets%2Fd2dc36483a865fa84c0f6bf1d23228bb
	tmp/cache/assets/D6A/DD0/sprockets%2F8b312d1484aaab9fdf38215cca5b0989
	tmp/cache/assets/D6E/FA0/sprockets%2Fc91f38d08128d8edf15c8e2703dd0fa1
	tmp/cache/assets/D71/CC0/sprockets%2F005ebed74ad702627e746c9d6c30d6ff
	tmp/cache/assets/D74/E30/sprockets%2F491cdd0ce60f3df20b29cd098f8d4773
	tmp/cache/assets/D78/9A0/sprockets%2Fea6ab7f5af91372551af680f6097f6ea
	tmp/cache/assets/D78/D40/sprockets%2F1b6efd2ff5f4179d8943a3470afc660e
	tmp/cache/assets/D83/BA0/sprockets%2Fba051ae3b64accba0915e35a3964e2c2
	tmp/cache/assets/D85/4C0/sprockets%2Faa350aa8d4515eca032a1e81d8553edb
	tmp/cache/assets/D94/0F0/sprockets%2Fd8f656c52e4761cf020cdd2a35d2abb8
	tmp/cache/assets/D96/350/sprockets%2F29c28e723f2e21b6ebf004ac0e5c6ec9
	tmp/cache/assets/D96/DC0/sprockets%2Faa35e9bd6a61904fb8ef284ac15dc025
	tmp/cache/assets/D99/730/sprockets%2Fefd3b6bf38c5f0520db1d4e570d8e514
	tmp/cache/assets/D99/7B0/sprockets%2F9aafd6004ac745565141eff92bb4ade6
	tmp/cache/assets/DA0/BA0/sprockets%2F91b37f4402fce9e32d5645ceb1fd07de
	tmp/cache/assets/DA0/DD0/sprockets%2F4c4eb877406f45cc9bef4caa4a0479e0
	tmp/cache/assets/DA1/B50/sprockets%2Faefb35bd7dd5c2fd877271ac7620e671
	tmp/cache/assets/DA4/460/sprockets%2F977ead1d20bc9f7e1c191bd4348f9e3a
	tmp/cache/assets/DAB/360/sprockets%2Fe69ee81e006ccdd6bc3d8481ee97146c
	tmp/cache/assets/DAB/E10/sprockets%2F95aecc1f2efd4e7f5759c42228d3ae74
	tmp/cache/assets/DAD/960/sprockets%2Ff58695caa371435bf6b77e18bbda69fd
	tmp/cache/assets/DAE/F80/sprockets%2Fcf92da27e7cdebbdc1682862984db836
	tmp/cache/assets/DB1/560/sprockets%2Fb0cd641e35523decc64cd73dd00a2ac1
	tmp/cache/assets/DBB/1C0/sprockets%2F3d9f29b5a840bfe95d9586e7db3f39bf
	tmp/cache/assets/DC2/F40/sprockets%2F80e1da1b76df6cee1d9c1144f5b23c4b
	tmp/cache/assets/DC5/610/sprockets%2Fed6fdc2e1daa7850b8611deb562b67b0
	tmp/cache/assets/DC5/C90/sprockets%2Fb3b980d46447e2a4f5110cc5e5edeaeb
	tmp/cache/assets/DCA/480/sprockets%2Fef513540f9efcae4a750eb9bb00bc677
	tmp/cache/assets/DCC/D70/sprockets%2F68a0bcd6fdbec55a57544c2e5e7c371a
	tmp/cache/assets/DD1/740/sprockets%2Fe2e8f7f4c2e46b20bbaa95d67e83c41e
	tmp/cache/assets/DD3/EF0/sprockets%2F224f9b81ee6c3a8f0fa9e6e5c3f1d5c2
	tmp/cache/assets/DD3/FA0/sprockets%2F4db8b3b1ffb746e8cae16494fed680a2
	tmp/cache/assets/DD4/AE0/sprockets%2F5fe287f4ea5c6bf67db254f31cc32e6c
	tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/DE6/710/sprockets%2F14b4d40a1910cba3c3f2bdca2ff58a8f
	tmp/cache/assets/DEB/750/sprockets%2F34a2eeac3b6eed1838ece50c1525a3bb
	tmp/cache/assets/DF1/710/sprockets%2F0f8aa08bcb16235a9f63bb55b7cdaad8
	tmp/cache/assets/DF2/3B0/sprockets%2F096ebb62a32e6a7504cdbbd3c9b8a3bf
	tmp/cache/assets/DF2/930/sprockets%2Fdee83eea0aeca1a948212c59db3ec523
	tmp/cache/assets/DFC/470/sprockets%2F8a0e7cc1ca5e1af0b1a30ac42ea00e1a
	tmp/cache/assets/DFE/D20/sprockets%2F8449efde0ba4d7aef0cd1d5b95c1b880
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/E07/600/sprockets%2F7e2d7dd531ce52683e7bea3deafc69e3
	tmp/cache/assets/E0B/A20/sprockets%2F0dcccf3cf5085ef5fb5e5a857889dad0
	tmp/cache/assets/E19/2A0/sprockets%2F10fcfbe6ebae11a40c8eac41939a1b9a
	tmp/cache/assets/E22/980/sprockets%2Fe7acfa2622bdd8b22ad5e8f5ddb4217a
	tmp/cache/assets/E2E/9C0/sprockets%2F713cf9e8eed3b4b50ef5ae9eb06fcb12
	tmp/cache/assets/E32/E20/sprockets%2Fedbe667dbcadf4bf72c873603ddd9c04
	tmp/cache/assets/E36/C60/sprockets%2F8fe0f8e49aad32dd96c9713e1eabe1df
	tmp/cache/assets/E3E/0B0/sprockets%2Ffab860891fba79afd0e86cfdebc27d86
	tmp/cache/assets/E55/6E0/sprockets%2F9d35cd8fa6cdc1810edbcfc1d35c71cb
	tmp/cache/assets/EBD/7F0/sprockets%2Fc3fb3faaf9796afacf7c51ebbcae344e
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_alerts.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_button-groups.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_buttons.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_carousel.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_code.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_component-animations.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_dropdowns.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_forms.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_labels-badges.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_mixins.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_modals.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_navbar.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_pagination.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_popovers.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_progress-bars.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_reset.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_responsive-1200px-min.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_responsive-767px-max.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_responsive-768px-979px.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_responsive-navbar.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_responsive-utilities.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_scaffolding.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_tables.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_thumbnails.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_type.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_variables.scssc
	tmp/cache/sass/c15b3f10c81ad05c8d720c78a7583373da6a8bcb/_wells.scssc
	tmp/pids/server.pid
Merge branch 'master' of https://github.com/nikneroz/bab

Conflicts:
	.idea/workspace.xml
Corrected store/_flats_in_central_menu.html.haml