Merge pull request #150 from tecnico-softeng/reportWork

Report work #149

Merge pull request #143 from tecnico-softeng/activity

Merge Activity features into develop

deleted fenix-framework.properties files

Removed duplicate elseif

Removed empty catch from Booking Constructor tests