bug #899 - added new screen with timeline
Merge pull request #3 from aadamski/bug_899

bug #899 - added new screen with timeline
Merge branch 'master' into bug_898

Conflicts:
	src/presence_analyzer/tests.py