Fixed occasional occurring activity state loss bug
Hunting for strange NullPointerException
Version bump
Merge branch 'bugfixing'