Add key, edit controllers
Deleted
Merge branch 'master' of https://github.com/AdmiralRico/manito into wishlist_2