adding estimates stuff
solving array initialization problem
changing timeout
Revert 84a35ab..fd95dea

This rolls back to commit 84a35abb81dfb86b9fe8c6c4b8e795e86a392568.
estimote name
podfile
Merge branch 'estimotes' of https://github.com/ltg-uic/hg-ios-patch-display into estimotes1

Conflicts:
	hg-ios-patch-display.xcodeproj/project.pbxproj

hg-ios-patch-display.xcodeproj/project.xcworkspace/xcshareddata/hg-ios-p
atch-display.xccheckout
	xmppTemplate/AppDelegate.m