fix after pull
fix after pull 2
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	Gemfile.lock