.
Merge branch 'master' of github.com:oskolsky/markup_re-store

Conflicts:
	build/data/contest_feed.html
	build/data/recommendations_feed.html
	build/data/reviews_feed.html
	build/data/videos_feed.html
	build/friends_apps_index.html
	build/friends_apps_show.html
	build/friends_contests_index.html
	build/friends_index.html
	build/friends_recommendations_feed_login.html
	build/friends_recommendations_feed_logout.html
	build/friends_recommendations_index.html
	build/friends_recommendations_show.html
	build/friends_reviews_feed.html
	build/friends_reviews_index.html
	build/friends_reviews_show.html
	build/friends_videos_catalog.html
	build/friends_videos_feed.html
	build/friends_videos_index.html
	build/friends_videos_show.html
	views/common/friends/_item_contest.haml
	views/common/friends/_item_contest_new.haml