Trying to fix things
Merge branch 'master' of github.com:Philenox/ti_collab

Conflicts:
	Rev1.2_firmware_wireless/settings/feedback.cspy.bat
	Rev1.2_firmware_wireless/settings/feedback.dni