new stuff
Merge branch 'master' of https://github.com/shangtee/FBU

Conflicts:
	Inlink/Inlink/INLAppDelegate.m