Merge branch 'dev'

Conflicts:
	app/src/main/res/layout/item_list_movie.xml
	app/src/main/res/layout/item_list_movie_sml.xml
Bump Gradle plugin verison
Because Picasso is asking okhttp and okhttp-urlconnection to be 1.6.0
(or newer)
Merge branch 'master' of github.com:yelinaung/philm into general-fix
Format the codes/gradle files
Merge pull request #1 from yelinaung/general-fix

Gradle build fixes