commit mfk
Merge commit '2d34d34262490f5f11bced6fbdb95f44b9110d0f'

Conflicts:
	app/assets/images/arrow.png
	app/assets/images/bullet.png
	app/assets/images/checked.png
	app/assets/images/close.png
	app/assets/images/companies/add.png
	app/assets/images/diamond.png
	app/assets/images/empty.png
	app/assets/images/facebook-small.png
	app/assets/images/icon-adress.png
	app/assets/images/icon-facebook.png
	app/assets/images/icon-mail.png
	app/assets/images/icon-phone.png
	app/assets/images/icon-twitter.png
	app/assets/images/if-logo.png
	app/assets/images/if-logo2d.png
	app/assets/images/lamp.png
	app/assets/images/logo.png
	app/assets/images/markers/icon1.png
	app/assets/images/markers/icon2.png
	app/assets/images/markers/icon3.png
	app/assets/images/markers/icon4.png
	app/assets/images/markers/icon5.png
	app/assets/images/markers/icon6.png
	app/assets/images/markers/icon7.png
	app/assets/images/news/news1.jpg
	app/assets/images/partners/1043.png
	app/assets/images/partners/24.png
	app/assets/images/partners/402.png
	app/assets/images/partners/gk.png
	app/assets/images/partners/inspired.png
	app/assets/images/partners/like.png
	app/assets/images/partners/reporter.png
	app/assets/images/partners/ua_modna.png
	app/assets/images/partners/vezha.png
	app/assets/images/photo.jpg
	app/assets/images/photo2.jpg
	app/assets/images/play-button.png
	app/assets/images/plus-red.png
	app/assets/images/plus.png
	app/assets/images/projects/city-brand.jpg
	app/assets/images/projects/grunvaldska-logo.png
	app/assets/images/projects/grunvaldska.jpg
	app/assets/images/projects/other.jpg
	app/assets/images/projects/small/p1.jpg
	app/assets/images/projects/small/p2.jpg
	app/assets/images/projects/small/p3.jpg
	app/assets/images/projects/small/p4.jpg
	app/assets/images/projects/small/p5.jpg
	app/assets/images/projects/urban-space.jpg
	app/assets/images/qm.png
	app/assets/images/required.png
	app/assets/images/success.png
	app/assets/images/super.png
	app/assets/images/transformer.png
	app/assets/images/triangle.png
	app/assets/images/twitter-small.png
	app/assets/images/video-back.jpg
	app/assets/images/warm-if-logo2d.png
	app/assets/images/webmil-logo.png
	app/assets/javascripts/jquery.tooltipster.min.js
	app/assets/stylesheets/application.css
	app/views/layouts/application.html.haml
	config/navigation.rb
	config/routes.rb
add vagrant
vagrant config improve
ckeditor assets upload
merge
add migrations
Merge pull request #1 from UrbanIF/ckeditor_file

CKEditor file upload