Merge branch 'dev' into server

Conflicts:
	timeside/__init__.py

diff --cc README.rst
Simple merge

diff --cc tests/test_AnalyzerResult.py
Simple merge

diff --cc timeside/__init__.py
Simple merge

diff --cc timeside/analyzer/core.py
Simple merge

diff --cc timeside/decoder/core.py
Simple merge

diff --cc timeside/decoder/file.py
Simple merge

diff --cc timeside/encoder/core.py
Simple merge

diff --cc timeside/grapher/core.py
Simple merge