ignore txt files in /temporary folder
Merge commit 'd69a109835ee4a3eb89a1ee5c434a528929b0464'
Fixed update of project and activity name next to the buzzer.
Merge branch 'master' of github.com:kimai/kimai
Merge branch 'master' of https://github.com/kimai/kimai
add a simple debug method to receive debug infos via JSON without interrupting communication
BUGFIX: properly get_timesheet using the user ID, otherwise the last timeEntry (e.g. of another user) would be loaded
Merge pull request #79 from blockhaus/bugfix

Bugfix
build path
Merge remote-tracking branch 'origin/master'
build path
build path
Implemented basic support for permissions.
Implemented permission check for timesheet and expense extension.
Code cleanup.
Fixed installation of permissions for expense extension.
Errors when adding users are shown correctly.
Improved logged permissions error messages.
Fixed updater to set admin group membership correctly.
Added missing function to get groups of an activity.
Update core/updater.php

Fix for updater script (bad sql statement)