Dummy hats and accessory view
fix
Merge commit '407f07710daf853bc4f0e14b44555e79957f4691' into development
Hopefully I didn't destroy anything
Conflicts:
	app/models/User.java