Remove allowBackup property from manifest
Remove uses-sdk attribute (overriden from build.gradle)

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Depend on Android support library 20.0.0

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>

Conflicts:
	library/build.gradle
Merge pull request #34 from kontalk/upstream

Upgrade support library version and other manifest fixes
Remove uses-sdk attribute (overriden from build.gradle)

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Depend on Android support library 20.0.0

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>

Conflicts:
	library/build.gradle
Merge conflict with previous commits
Build against API level 21/build tools 21.0.1

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Merge pull request #33 from necronet/master

Remove allowBackup property from manifest
Merge pull request #37 from daniele-athome/master

Build against API level 21/build tools 21.0.1
Obsolete support for Eclipse
Allowed to use EmojiconTextView.setText(CharSequence, ...) with null argument as does android.widget.TextView.
A bit cleaner code.
Merge pull request #40 from praetoriandroid/master

Allowed to use EmojiconTextView.setText(CharSequence, ...) with null argument.
Fix Travis build

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Merge remote-tracking branch 'upstream/master'

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>

Conflicts:
	.travis.yml
	example/build.gradle
	library/build.gradle
	library/src/main/AndroidManifest.xml