normal commit
Merge branch 'develop' of github.com:httpftpli/AM33LB_LIB into develop

Conflicts:
	platform/include/pf_key_touchpad.h