POPS-191 more for multi-flight timer and timezone fixed
Merge branch 'develop' into POPS-191
Merge pull request #16 from vinkobuble/develop

POPS-191 part 2 - adoption for multi flight scenario