run house light, menu scrollable
Merge branch 'master' of https://github.com/geoonn/onlineTrader-FULL

Conflicts:
	app/assets/html/dealer_daily_profit.html