fix edit of link, format
Merge branch 'master' into development
minor format
preset base_url