about to introduce drag and drop
committing changes before merge
Merge branch 'master' of gh:molecule-madness/mm
added placeholder.xml
Merge branch 'steve'