Linda dev

merge in working favorites code and updated jshint/jscs