changed desc in readme
integrate changes from mapjs for keyboard shortcuts
Merge branch 'master' of heroku.com:evening-tundra-5858
upgrade to jquery 1.9.0
from mapjs - disable tab presses when editing
to keep damjan quiet
keyboard shortcut button
Merge branch 'master' of github.com:mindmup/mindmup

Conflicts:
	views/layout.erb
logo now loading from s3
welcome message moved to a partial view from web.rb
reformat
support for multiple welcome messages
shorter keyboart tips, activating on hover
removed tab info from help, as it no longer works
fix for ruby 1.9.2
merged from mapjs - scroll map when setting active node off screen
bugfix, reading kinnetic from amazon if online
merged with mapjs
voting on features
automatically show vote form if #vote is in url, so we can advertise voting on twitter. do not submit voting if nothing selected