reorganise cap / rake import tasks
Merge branch 'develop' of github.com:unepwcmc/SAPI into develop

Conflicts:
	config/deploy.rb