Merge origin/master

Conflicts:
	web/html/frames/cashout-card-frame.html