commit and sync
commit
Merge branch 'master' into source

Conflicts:
	Gemfile.lock