Implemented draggable properties
Merge branch 'master' of https://github.com/dwimmer/ArgumentMapping

Conflicts:
	main.html