Change new line code.
eclipse project setting
Merge branch 'master' into develop

Conflicts:
	.project
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.jdt.ui.prefs