Air By Date bugfixes
Merge branch 'develop'