Update .iml files
Use CardViews in the profile grid view
Use a CardView for the profile user icon as well
Merge branch 'grid-card'

Conflicts:
	app/app.iml