Getting the files data properly from server.
Merge branch 'master' of https://github.com/FieryWeasel/MediaView

Conflicts:
	MediaView/app/src/main/java/com/mediaview/mediaview/Activities/MainActivity.java