Merge branch 'aaron-dev' into nathan-dev
Merge remote-tracking branch 'origin/richmond-dev' into nathan-dev
registration/login error messaging added
forgot password functionality added
Merge branch 'nathan-dev' into richmond-dev
merging in nathan's latest changes
entire text of wiki article is appending to location details page in plain text