Merge branch 'master' into development
remove url changing
Merge branch 'development'