Minor changes
Merge branch 'master' of https://github.com/shangtee/FBU

Conflicts:
	Inlink/Inlink.xcodeproj/project.pbxproj

whats going on
Merge branch 'master' of https://github.com/shangtee/FBU

merge merge