i
Merge branch 'master' of https://github.com/mianos/sakemon

merge latest
reverted areagraph changes
Merge branch 'master' of https://github.com/mianos/sakemon

merge of zoom
added status page
fixed bug with new status page
Merge branch 'master' of https://github.com/mianos/sakemon

Conflicts:
	console.py

fixed merge conflict
not sure
Merge branch 'master' of https://github.com/mianos/sakemon

latest
nothing
Merge branch 'master' of https://github.com/mianos/sakemon

nothing
Merge branch 'master', remote-tracking branch 'upstream/master'