removed all floating button code
css add back for button placement
Merge remote-tracking branch 'remotes/origin/B1559' into develop

Conflicts:
	catalog/admin/templates/default/css/styles/custom.css