added more info to menu
merging
Merge branch 'master' of https://github.com/bleveque/lechuga
changing click handlers, removing some extra selectors
fixing conflicts