merge phase2/felig branch into phase2/master

Hi Frans,

Tried to clean the repository and moved files not used by any other flavour into the FELIG folder. GBT is working fine, LPGBT is still a work in progress. The only other thing to point out is that for now, we are using a modified version of the housekeeping entity but I plan to move to the standard one soon. If you have any questions or see any issues let me know.

Cheers, Ricardo