Merge branch 'master' of https://github.com/derula/jira-log into derula-master

Conflicts:
	htdocs/dispatcher.php