Keyboard stuff
Merge branch 'develop' of github.com:fishstix/fishstix-ios-sdk into develop

Conflicts:
	fishstix-ios-sdk/FSAppDelegate.m