run bundle install
create find method generetor - base controllers
Merge branch 'api_controller' into bootstrap_integration

Conflicts:
	Gemfile.lock
	app/controllers/application_controller.rb