Merge remote-tracking branch 'origin/master'

Conflicts:
	Classes/DataManager.h

Merge remote-tracking branch
'origin/master'

Conflicts:
	Classes/DataManager.h

Merge
remote-tracking
branch
'origin/master'

Conflicts:
	Classes/DataManager.h

Merge
remote-tracking
branch
'origin/master'

Conflicts:
	Classes/DataManager.h

aa

aawft

Merge
remote-tracking
branch
'origin/master'

Conflicts:
	Classes/DataManager.h

dataManager

dataManager