jira provider epic source uncommented for development/debug
simple calculation for accepted SP added | developer added for Renaissance team | jira provider using default JQL for epics
local workspace.xml
Merge branches 'develop' and 'master' of https://github.com/ZloiBubr/ReportTool into mikitas_branch

Conflicts:
	.idea/workspace.xml
remove not used argument for calculating accepted SP
remove workspace.xml from git index
Merge branch 'master' into mikitas_branch

Conflicts:
	.idea/workspace.xml
Added:
-- Sort columns;
-- Totals;
Stop tracking:
-- .idea\workspace.xml
Merge branch 'mikitas_branch' of https://github.com/ZloiBubr/ReportTool into Edgar_Branch

Conflicts:
	.idea/workspace.xml
	middleware/personalprogress.js
	public/pages/timeSheet2week.html
Merge remote-tracking branch 'origin/master' into Edgar_Branch
Add:
-- Total for new column;
Merge branch 'master' into Edgar_Branch
Merge remote-tracking branch 'origin/Edgar_Branch' into develop
fixed status for cancelled page
Merge branch 'develop'
Merge branch 'master' of https://github.com/ZloiBubr/ReportTool