Stashing local changes( which the most recent version is a superset of mine)
Stashin changes
Merge branch 'video-plugin' of git://github.com/wysiwhat/Aloha-Editor into video-plugin
Added marvin's google picker code