modified
modified
modified
modified
modified
modified
modified
Merge remote-tracking branch 'origin' into develop

Conflicts:
	client-main/Classes/AppDelegate.cpp
	client-main/Classes/AppDelegate.h
Merge branch 'master' into develop

Conflicts:
	client-main/Classes/AppDelegate.cpp
	client-main/Classes/AppDelegate.h
	client-main/Classes/core/CommandsRegister.cpp
modified