Merge pull request #25 from thelabtech/MH-530

Mh 530
Merge pull request #24 from thelabtech/MH-528

Fix update user's gender in profile page
Add show hide for option in create a survey

Hide the last field in add new survey form
Merge pull request #26 from thelabtech/MH-456

Mh 456
Update rails.
Rearrange divs for consistency of the UI
Add heading style for saved search menu from the leftsidebar
Fix show labels after update process in profile page
Fix conflicts after merging MH-531 to dev
Fix css conflicts for the other design
Merge branch 'MH-531' into dev