Split manifest into deployment and development
Merge branch 'master' into controller
Revise removePlace and add removeStop