Added english translation
Merge branch 'master' of github.com:1000ideas/l
Fix context menu on scroll
Merge branch 'master' into tinymce-integration

Conflicts:
	lib/l/version.rb
Missing views/actions/etc.
Fix module generation. Change readme to new tinymce-rails