store previous location
merge conflict
Merge pull request #145 from calblueprint/jdu/login_redirect

store previous location