Remake of Button mapping
Merge branch 'dev' of https://github.com/corvusalba/toy-factory into dev