edit 3 on dev
add eggfoo
Merge branch 'eggfoo' into dev