Use new version of the REST Endpoints
Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into 569-upgrade-push-rest-endpoints
Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into 569-upgrade-push-rest-endpoints
export hardcoded string to strings.xml
add an errorType and an errorMessage to all onFailure callbacks
Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into 569-upgrade-push-rest-endpoints

Conflicts:
	src/org/wordpress/android/ui/notifications/NotificationUtils.java
Upgrade logging calls
fix calls to ApiHelper tasks
add a toast error message when media upload fails
Merge branch 'develop' into issue/218-upload-task-error

Fix Conflicts in:
	src/org/xmlrpc/android/ApiHelper.java
Log all setError from ApiHelper
track Throwable instead of Exception
add Throwable to onFailure
update ApiHelper.GenericCallBack receivers
Fix #652 - In comments with emoticons, URLs are not clickable
fix unhandled JSON exception
Fix an errorType check
Merge pull request #639 from wordpress-mobile/issue/218-upload-task-error

Fix #218: upload task error
Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into 569-upgrade-push-rest-endpoints

Conflicts:
	src/org/wordpress/android/WordPress.java
	src/org/wordpress/android/ui/notifications/NotificationUtils.java
Use AppLog instead of Log