Merge remote-tracking branch 'upstream/develop' into develop

grab
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop

mmmmmmm
Merge remote-tracking branch 'upstream/develop' into develop

balls
dashboard display
images shit
Merge pull request #79 from MarwanNakhaleh/develop

dashboard image crap whatever link crap