More f work
Merge branch 'master' of https://github.com/KostasKostogloy/openmuseumproject