Changed ID and location
Merge remote-tracking branch 'origin/master'
Change include to lower case
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main.c
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main.c
set default to XXX
fixed bug found by Mark where the serial was being setup with 9600 for both GPS and non-GPS modes rather than 115200
FIXED bug where repeated packet was actually only at 10mW rather than the pre-defined POWER_OUTPUT. This would explain on the test flight EMF14 we only downlinked packets and didn't get repeated packets
added random number generator (well sort of) and then added random delays to avoid packet clashes
added random delay and tested code - appears to be working
switched \n\r to \r\n to allow python to work better (upload scripts etc)
added RSSI reporting in the serial debug - allows RSSI to be reported to the server to help work stuff out in the future
Currently reports last rssi in packet but not to console - seems to hang if printf of rssi - unsure why. also have added another define to comment out serial in as not always required.
Merge remote-tracking branch 'upstream/master'