Cleanup
Merge branch 'master' of github.com:flavour/eden
ARC: Update to current & start customisations
IFRC: Small fixes