Merge remote-tracking branch 'upstream/master'
Fixed null-user problem with view_wishes
Minor change to auth - exposing isAuthenticated
Merge remote-tracking branch 'upstream/master'
Played with about & contact page. Formatting, delays, content.