Redirection fixes
Merge branch 'master' of https://github.com/globeestate11/estate
Normal Flow Non Globe
Conflict in order controller