AUTO-806 correctly set the operating_system variable (operating_system vice os)
Resolved merge conflicts
Merge pull request #251 from GrabNetworks/auto806

AUTO-802 - track user environment information
Version: 2.3.2.1-05282013
fixed flawed dashboard on 1024x768 resolution
added fix for no message displayed when trying to link a not existing account
changed version
Merge pull request #253 from GrabNetworks/auto824

Auto824
os - chanced function for auto806 and accout page fix (leave page)
Merge pull request #254 from GrabNetworks/auto806_fix

os - chanced function for auto806 and accout page fix (leave page)
Fixed failing tests as a result of the data reload
added 16 px margin between messages panel and the feeds activity panel
Merge pull request #255 from GrabNetworks/auto805

added 16 px margin between messages panel and the feeds activity panel
Merged integration, and resolved conflict