ø
Added some calculation functionality
Merge branch 'master' of https://github.com/dstoreng/workhours.git

Conflicts:
	WorkHours/project.properties
Merge branch 'sikkerhet'