Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
directive for dragging file uploads
Merge branch 'master' of https://github.com/bdevos/chronicle

Conflicts:
	chronicle-app/chronicle/app/index.html
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Fixed the page delete
Merge remote-tracking branch 'origin/master'