code style format
continue
Merge branch 'develop' of github.com:copmobidev/cop-peleus into develop
Merge branch 'develop' of github.com:copmobidev/cop-peleus into develop

Conflicts:
	Peleus/Peleus/LCDataConfig.h