Merge branch 'release/1.0'
include bundler in capistrano
Merge branch 'release/2.0.0'

Conflicts:
	Capfile
Merge branch 'master' into develop