small bug changes
Merge branch 'master' of https://github.com/tachyo/esp_hauptbeispiel

important merge
MERGE
minor changes
another merge
NOTHING WORKING