night 8:30
Merge branch 'master' of https://github.com/51App/FYRADIO

Conflicts:
	SIrico-FlyRadio/Classes/Controllers/SIHomeViewController.m
	SIrico-FlyRadio/SIAppDelegate.m