remove cap deploy
Merge branch 'development'