Fixed design, fixed error in API key removal, hidden sensitive data
needs merge fix Netbeans
Merge branch 'pokus'
Merge branch 'master' into pokus