Merge branch 'master' of C:\xampp\htdocs\lappc with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	_ide_helper.php
more products