Fixed file headers
Removed .php_cs
CS fixes
Merge remote-tracking branch 'origin/2.1'

Conflicts:
	src/Security.php
Fixed dependencies