#29: removed hack for encoding
#29: update "newrelic_rpm" and fix "undefined method empty? for nil:NilClass"
#29: removed "iconv" library
#29: update deploy/production.rb.sample
#29: update rails
#29: merge master into branch
#29: update "grit" gem
Merge branch 'master' into 29-migrate-to-ruby-2.1

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/activity_feeds_controller.rb
	app/models/activity_feed_observer.rb
	config/environments/development.rb
	config/initializers/a_app_config.rb
	config/initializers/airbrake.rb
	lib/modules/models/git.rb
	spec/controllers/activity_feeds_controller_spec.rb
	spec/helpers/activity_feeds_helper_spec.rb
[#29] remove encode strings
[#29] add iconv gem
[#29] add host to database.yml
[#29] update grit
[#29] change travis ruby version
[#29] update grit
add therubyracer
Merge branch 'master' into 29-migrate-to-ruby-2.1
#29: updated gems, remove old code
[#29] remove iconv
[#29] try to fix invalid byte sequence in UTF-8
#29: updated whenever gem