in the middle of writing custom drag function
yep
Merge branch 'master' of https://github.com/JimmyFW/afterthink-engine

Conflicts:
	public/templates/index.html