Sprint 2, finpuss gjenstår
Merge branch 'ds2'

Conflicts:
	WorkHours/src/com/example/workhours/fragments/ConfirmDialog.java
Dynamisk UI
Notification fix
ø
smårips
**Stable**
	Merge branch 'sikkerhetD'
**Stable**
	Merge branch 'sikkerhetD'
Fjerning av unødvendige ting
Delete function added
Delete function added
Layout fix
Merge branch 'ds4'
Merge branch 'master' of https://github.com/dstoreng/workhours.git

Conflicts:
	WorkHours/project.properties
Merge branch 'sikkerhet'
Fjernet rips
l
Refactoring
Fixed some of the aesthetic. Focusable edit texts, log out fixed, log in
with facebook fixed, Refacored a lot