Improved user interface.
Merge branch 'master' into gh-pages
Merge branch 'gh-pages' into cordova