Merge branch 'master' of ssh://192.168.136.45:10022/SERVER/langer

# Conflicts:
#	web/ansjer_answer/lottery/index.html