MAGICAL RECORD BITCH!!!
Merge remote-tracking branch 'origin/estimotes' into estimotes1

Conflicts:
	Podfile
	xmppTemplate/AppDelegate.m
	xmppTemplate/hg-ios-patch-display-Prefix.pch
merged with paulo