updated
updated
deleted vendor

 Please enter the commit message for your changes. Lines starting
Merge branch 'master' into develop
Merge branch 'develop' into feature/calendar

Conflicts:
	Gemfile.lock