Merge pull request #33 from damouse/ajax

Ajax
subjects filtering based on currently logged in user, no longer are visible to other users.
merge fix
inital recovery commit
Merge branch 'triage' into dev
commit again before merging
solved merge conflicts, line endings