functionally complete

needs a lot of cleanup
Merge branch 'master' of https://github.com/dujoducom/framematch

Conflicts:
	www/draganddrop.html
	www/js/ArtFrame.js
	www/js/artobjects.json
	www/js/main.js