Moved some mime type methods to MediaUtils, and moved MediaUtils class to the 'util' folder.
Before uploading media, get the correct mime type and file name. Fixes #1081.
Get the file extension through the mimeType instead of the file path. Fixes issue where huge file path would be displayed for queued media items.
Moved custom imageLoader & requestQueue out of MediaBrowserActivity so it could be reused by other classes
Rewrote MediaImageLoader
MediaImageLoader no longer extends ImageLoader
Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into issue/1085-npe-media-library
Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into issue/1085-npe-media-library
Merge pull request #1086 from wordpress-mobile/issue/1085-npe-media-library

Issue/1085 npe media library
Moved file extension code out to its own method so that it can be used in MediaGridAdapter easily.
Merge branch 'develop' into issue/1081-photos-app-media-library

Conflicts:
	src/org/wordpress/android/ui/media/MediaBrowserActivity.java
	src/org/wordpress/android/ui/media/MediaGridAdapter.java
	src/org/wordpress/android/ui/media/MediaItemFragment.java
	src/org/wordpress/android/util/MediaUtils.java
Removing an unneeded toUpperCase()
Merge pull request #1082 from wordpress-mobile/issue/1081-photos-app-media-library

Fix for broken media uploads
Rename TrustAllSSLSocketFactory to a more correct TrustUserSSLCertsSocketFactory
Set the connection timeouts to 30secs.
Merge pull request #1089 from wordpress-mobile/issue/1088-XML-RPC-timeout

issue/1088 set the correct connection timeouts in the XML-RPC client
Merge branch 'develop' into issue/989-expose-applog-to-all-users

Conflicts:
	src/org/wordpress/android/ui/posts/EditPostContentFragment.java
	src/org/wordpress/android/util/MediaUtils.java