added jquery file upload as plugin and fixed drag and drop file upload issue.
added jquery file upload as plugin and fixed drag and drop file upload issue.
Merge branch 'dev-master'

Conflicts:
	public/scripts/app.js
	public/scripts/controllers/Dashboard.js