Dev Forced commit, probably broke line endings.
I hate windows + git
Merge branch 'Plugin' of https://github.com/LimeSurvey/LimeSurvey into HEAD

Conflicts:
	application/libraries/PluginManager/ExamplePlugin.php