Merge branch 'release/v0.1.3' into develop
Adding deploy config
Add whenever
Merge branch 'feature/add_deploy_config' into develop

Conflicts:
	config/deploy.rb
Merge branch 'release/v0.1.4'