merging...
TODO:
interceptor & logout button buggy

info& monitor:
 time intervals for graph
code refactoring
etc.
Merge remote-tracking branch 'origin/master'