Merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	system/logs/error.txt
Repair Phone & Tablets com. 2