Merge branch 'dev'

Conflicts:
	app/src/main/res/layout/item_list_movie.xml
	app/src/main/res/layout/item_list_movie_sml.xml