Thinking of upgrading my 4S. Going through the pluses and minuses of iPhone or an android. One of the biggest is easy storage, adding movies, songs, ring tones, books, etc to a phone. Apple makes it hard, some of the android phones make it easy. Could the new iPhone 6 change this?