added slider
has cocoa pods now with estimotesSDK
line break
Merge remote-tracking branch 'origin/estimotes' into estimotes1

Conflicts:
	hg-ios-patch-display.xcodeproj/project.pbxproj
	xmppTemplate/AppDelegate.m
new line break after merge