gy-
Merge branch 'master' of
https://github.com/Zellfenix/JADE_SMA_Commercial.git

Conflicts:
	JADE_SMA_Commercial/APDescription.txt