cambios
Merge branch 'master' of https://github.com/rickstart/MovieFriend-Android

Conflicts:
	app/src/main/java/com/rickstart/moviefriend/MovieGridFragment.java