remove app symlink as it breaks erica
merge branch master