added drag and drop (not working yet)
Merge origin/master
added drag and drop (not working yet)
Merge origin/master

Conflicts:
	.gitignore