Remove special char at the begin of the file
Merge origin/master

Conflicts:
	filtersettings.php
Upgrade for moodle 2.6