Merge branch 'master' of gitlab.zigexn.vn:vietth/VietTH-VenShop into vietth_feat_newrelic

Conflicts:
	app/controllers/categories_controller.rb

config/deploy/production.rb

@@ -2,7 +2,7 @@ set :port, 22
 set :user, 'alicuche'
 set :deploy_via, :remote_cache
 set :use_sudo, false
-set :repo_url, 'git@bitbucket.org:alicuche/venshop.git'
+set :repo_url, 'git@gitlab.zigexn.vn:vietth/VietTH-VenShop.git'
 
 server 'alicuche.koding.io',
   roles: [:web, :app, :db],