Added label_fingerprint_local which seems to have gone missing
Removed duplicates that got inserted
Merge pull request #440 from petervnv/master

Added label_fingerprint_local which seems to have gone missing
ensure contactview is setup for the picker
remove minimal SDK incompat flags
fix cursor closed issue with intent API
improvements to chats, contacts flow
add permission for heartbeat on cyanogen
updated to 13.2.0-alpha-2
add cursor API 19 level method support
update target API
show integrate contacts and chat view
all accounts/chats now shown in one list
add title text back in to show chat/contacts mode
update to 19
ensure searching works for full username
make view profile a top menu actionbar option
show username in list
update ant build script to android-19
Merge branch 'master' of github.com:n8fr8/Gibberbot

Conflicts:
	res/values/strings.xml
	src/info/guardianproject/otr/app/im/app/NewChatActivity.java