WIP
Merge branch 'silex' of github.com:keradus/imgGrep into silex

Conflicts:
	.php_cs
WIP
WIP