CRLF will be replaced by LF
Fix incorrect detection of string as php-format by xgettext.

Because of "100%" in the string, xgettext thinks this is a format string. This is wrong, so add the appropriate tag to correct the heuristics.
Merge pull request #779 from vslavik/patch-1

Fix incorrect detection of string as php-format by xgettext.
Version 3.2.0

Conflicts:
	oc-includes/osclass/assets/js/tiny_mce/plugins/ajaxfilemanager/inc/config.base.php
Merge branch 'master' of github.com:osclass/Osclass
Merge branch 'hotfixes' into develop
Merge branch 'issue-857' into develop
Merge branch 'hotfixes' into develop
use Grunt to compile sass bender theme, add compass variable
Ignore .sass-cache
Compressed Main stylesheet
removed DS_store and css files
Fixes global.css to main.css
Merge branch 'hotfixes' into develop
Merge branch 'hotfixes' into develop
Merge branch 'hotfixes' into develop
Merge branch 'hotfixes' into develop
Merge branch 'hotfixes' into develop
Merge branch 'hotfixes' into develop
Merge branch 'hotfixes' into develop