merged style-layout
merge style-layout
merge in style-layout
merged style-layout
removed delete links for stock/option on  user dashboard
capitalization changes on stock/option show pages, added user_id(2) stocks/options for sandboxing