added integ tests, route to /rest
Merge pull request #22 from eugenefilimonov/user_rest_integ

added integ tests, route to /rest
migrated voting models
removed other test folder we dont use
working on save to s3
Merge branch 'master' into basedata

needed to save
resolve conflicts
Merge pull request #24 from eugenefilimonov/voting_tables

Voting tables
Merge pull request #25 from eugenefilimonov/basedata

Basedata
working on landing page
Merge branch 'master' into working_branch
new dish form added
Create Dish Tests work with Curr User
Merge pull request #27 from eugenefilimonov/rest_show

Rest show
started putting categs in tabs
Merge branch 'master' into rest_show
Upload friend images via Paperclip
added js to tabs
working on save to s3 two
Upload friend images via Paperclip