update some parts of amounts
Merge branch 'master' of https://github.com/hsinhsiao/angelapartment

Conflicts:
	app/views/admins/rooms/_form.html.erb