Merge pull request #1 from mplaza/melabranch

added gems
Merge pull request #2 from mplaza/melabranch

feedzilla
added nokogiri gem
Merge pull request #3 from mplaza/paulbranch

added nokogiri gem
added json gem, changed model name, removed turbolinks
Merge pull request #4 from mplaza/master

Merge pull request #3 from mplaza/paulbranch
Merge pull request #5 from mplaza/paulbranch

Paulbranch
fixed migration file for searchresults
Merge branch 'master' into paulbranch
Merge pull request #6 from mplaza/paulbranch

Paulbranch
admin model