Merge remote-tracking branch 'origin/MNaida_Task'

Conflicts:
	app/controllers/api/v1/search_controller.rb
	app/controllers/index.es6
	app/templates/user_posts.hbs
	config/router.es6
	config/routes.rb