fix frontend for some platform
Merge remote-tracking branch 'origin/fix_price_js' into dev

Conflicts:
	app/assets/javascripts/app.js