Merge branch 'master' of github.com:Oneill38/drinkr into develop
added delivery auth links
commented out JS tests
fixed travis conflict