Meeting agenda 13/5-14
Added a not working listener in PUShowAll and minor bug fixes
Fixed merge conflict