updated server base url
switched to live server
Merge branch 'develop' into Mensa