GUI updated. Database implemented
Merge branch 'master' of https://github.com/grumpo/SWAzam