Fixed redirect bug causing window.history.back() to redirect endlessly.
Merge branch 'development'
Preparing for heroku push.