Merging
Merge branch 'master' of https://github.com/tLiMiT/TinCan-XBee-Phone

Conflicts:
	src/audioPlayer.c
Merge branch 'master' of https://github.com/tLiMiT/TinCan-XBee-Phone