Merge branch 'master' of gitlab.com:crafts-records/talkadvisor/talkadvisor-back into documenting-talkadvisor

# Conflicts:
#	README.md