Add search function
Add search function
Merge branch 'dev' of github.com:scan33scan33/swift-hack-2014 into dev

Conflicts:
	FDT.xcodeproj/project.pbxproj
	FDT/Base.lproj/LaunchScreen.xib
	FDT/Base.lproj/Main.storyboard