Capistrano 3 migration
Tweak in deploy/production
Fix findings permited params
Migration to Rails 4.0.1.rc3
Add params to finding childs
Merge branch 'master' of github.com:francocatena/mawida_app
Follow up date param to oportunities
Removed unit from resource class
Add whenever task to deploy.rb
Merge branch 'master' into cap3

Conflicts:
	Gemfile
	Gemfile.lock
Report fix in conclusion
Report fix in follow up
Fix mini typo in conclusion_common_reports
Changed paramaters by settings
Fixed test errors
rails destroy scaffold parameter
Fixed foreign_keys
Improved settings
Improved setting validates
Merge branch 'settings'