template: icons
mysql integration
Merge branch 'development'