drag and drop
drag and drop
fix formatting
fix delete function
Merge branch 'master' into dev

* master:
  resolution fix
  security fixes
  add register function

Conflicts:
	src/application/views/scripts/files/index.phtml
fix format
drag and drop
Merge branch 'master' into dev

* master:
  news fix
  update newsController add addnewsAction
  add incomplete dynamic news
Merge branch 'dev' of https://github.com/cebor/wt-project into dev

Conflicts:
	src/application/models/SubjectsMapper.php
	src/application/views/scripts/files/index.phtml
delete deletefunction
add delete function for cat, subj & file
fix dnd for all
fix
Merge remote-tracking branch 'origin/dev' into dev

* origin/dev:
  fix dnd for all
Merge branch 'dev'

* dev:
  fix
  fix dnd for all
  add delete function for cat, subj & file
  delete deletefunction
  drag and drop
  fix format
  fix delete function
  fix formatting
  drag and drop
  drag and drop