Pravesh - Deploy changes to help with capistrano Try#1
Merge branch 'master' of https://github.com/sergioviera/betterjobscms

Conflicts:
	config/deploy.rb