Updated
Merge remote-tracking branch 'origin/develop'

Conflicts:
	.gitignore