commit 8314996c094db3df8602c19f3642b6f0de82c7c5
Merge: 59ef003 49eb58f
Author: Paul van Tilburg <paul@mozcode.nl>
Date:   Sat Nov 1 18:10:09 2014 +0100

    Merge branch 'feature/02ad0e-improve-main-overview' into development (closes: #02ad0e)