Merge branch 'feature/kbevents' of https://github.com/diversario/ar-drone-client into diversario-feature/kbevents

    Conflicts:
        app.js
        package.json
        views/index.jade
        views/layout.jade