Synchronized with other repository

Mainly layout improvements and database support as well as Markus
Twitter stuff