Ed upgrade

Not sure what to do about the bower file, due to the bug in beta.12
Test added to master.