add free RTOS to wyLight Firmware for CC3200
Merge branch 'Master' of github.com:polybassa/Wifly_Light into Master
fix typo on wylight.de
Thanks to Jörn
Merge remote-tracking branch 'upstream/Master'
Merge pull request #191 from tawarisch/master

web: fix type on wylight.de
clean master
add firmware file to android/assets/ when bulding android_client
Merge commit 'ed0de2a9c52fa8fe2588371702ce59b4555d281e' into FreeRTOS

Conflicts:
	cc3200/example/serial_wifi/ccs/Release/main.pp
	cc3200/wyLightFirmware/firmware/ccs/.cproject
	cc3200/wyLightFirmware/firmware/ccs/Release/ccsObjs.opt
	cc3200/wyLightFirmware/firmware/ccs/Release/firmware_download.obj
	cc3200/wyLightFirmware/firmware/ccs/Release/firmware_download.pp
	cc3200/wyLightFirmware/firmware/ccs/Release/objects.mk
	cc3200/wyLightFirmware/firmware/ccs/Release/pinmux.obj
	cc3200/wyLightFirmware/firmware/ccs/Release/startup_ccs.obj
	cc3200/wyLightFirmware/firmware/ccs/Release/subdir_rules.mk
	cc3200/wyLightFirmware/firmware/ccs/Release/uart_if.obj
	cc3200/wyLightFirmware/firmware/main.c