Introducting persistent MySQL DB: Merge branch 'develop'