few issue fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	CodeFormatter/CodeFormatter.php