test
suppression diff.php
Merge branch 'develop' of github.com:Froutch/SmartVision into develop

Conflicts:
	diff.php