Added caching to media list
Merge branch 'master' into nick

Conflicts:
	Podfile
	Podfile.lock
	Pods/Manifest.lock
	Pods/Pods-Bolts-Private.xcconfig
	Pods/Pods-Facebook-iOS-SDK-Private.xcconfig
	Pods/Pods-Parse-Private.xcconfig
	Pods/Pods.xcconfig
	Pods/Pods.xcodeproj/project.pbxproj
Some shit
Added Cache
Merge pull request #14 from Gatzy118/nick

Added caching to media list