Replace gson with jackson
Merge branch 'master' into jackson

Conflicts:
	src/com/irccloud/android/activity/BaseActivity.java
Improve check for unset nick
Convert :emoji: into native emoji on Android 4.1+
Fix the unicode values for the emoji country flags
Better codes for :one: - :zero:
:hash:
Prevent :hash: from matching the channel regex
Add a field for editing the network name, fix a bug where long-pressing a server and selecting 'edit connection' would edit the wrong cid
seenEids not seeneids, heartbeats now work again
update channel regex
improve emoji regex
emoji-disableconvert
Fix a crash
Convert some incoming unicode emoji values to match the KitKat font
updated emoji map
html entities
Fix users list button disappearing on tablets when rotating from landscape to portrait
add Jackson to the list of open source licenses
Update junit tests