Merge branch 'master' of github.com:quappi/CultureRadio

Conflicts: pythonServer/webservice/templates/webservice/index.html (@skmp)

webapp: New style, simpler logic (@skmp)

Merge branch 'master' of https://github.com/quappi/CultureRadio (@larissa95)

enlargen search radius added (@larissa95)

Merge branch 'master' of https://github.com/quappi/CultureRadio (@frogg)

added . at the end of readme file (@frogg)

remove logs to fasten server (@larissa95)

test (@larissa95)

webservice integrated (@larissa95)

Merge branch 'master' of https://github.com/quappi/CultureRadio (@larissa95)

code cleaning (@larissa95)

Merge branch 'master' of https://github.com/quappi/CultureRadio (@frogg)

added wiki to readme (@frogg)

bug fixed db cache working (@larissa95)

d (@larissa95)

Merge branch 'master' of https://github.com/quappi/CultureRadio (@larissa95)

db chache (@larissa95)

Merge branch 'master' of https://github.com/quappi/CultureRadio (@frogg)

iOS App bug fix + readme text added (@frogg)

serializer (@larissa95)

Merge branch 'master' of https://github.com/quappi/CultureRadio (@larissa95)

first database entries (@larissa95)

rechtschreibfehler in readme (@frogg)

edited readme (@frogg)

Merge branch 'master' of https://github.com/quappi/CultureRadio (@frogg)

better design, lock screen png hack to show map and cover, randomly select tracks from server feedback JSON Array (@frogg)

Merge branch 'master' of github.com:quappi/CultureRadio (@skmp)

webapp: Update to latest api (@skmp)

db fixes (@larissa95)

enabled multiple results (@larissa95)

uri storage added (@larissa95)

city added (@larissa95)

failure message added (@larissa95)

Merge branch 'master' of https://github.com/quappi/CultureRadio (@larissa95)

valid server (@larissa95)

Merge branch 'master' of https://github.com/quappi/CultureRadio (@frogg)

added important iOS app design features and better server communications (@frogg)