Cleaned url files of useless comments
fixed login redirect
resolve merge conflict with cleanup
merge conflict