Add modes
Merge branch 'develop' of git.assembla.com:lp-tech-museum.nuance into develop