Merge pull request #55 from ns-uw/master

Change 'Profile' link to 'Settings'; change function called by link as w...