mefre conflicts
merge conflicts
some small fixes to shared.html, correct version of atk4 (notworking yet), lost content/index.mp added