Show avatar in edit user form, fix the size of avatar for 70x70
Edit user changing password form
Merge branch 'create-model' of https://github.com/247DigitalGroup/click_lion into create-model

Conflicts:
	app/services/layout_detail/profile_layout_detail.rb