Change default naming
Change base application URL
Merge branch 'master' into localAK

* master:
  Change base application URL
  Change default naming
Merge changes into branch