pur->cfm, pur->acpt ok
Merge remote-tracking branch 'origin/litup_hero'

Conflicts:
	.gitignore