Merge branch 'master' of git://github.com/Adam89/fourth_meal into adam_2
fixed double rendering of address partial and moved new restaurant link to footer
fixed merge conflict