after logging go back to previous page
Merge remote-tracking branch 'upstream/master'