java file
new pop up funciotn for the new task thing.
Merge pull request #12 from TobyPalmer/christoffer

New task updated
moved one tablerow
Merge pull request #13 from TobyPalmer/christoffer

moved one tablerow
R skit igen
Update .gitignore
weird stuff, RRRR
Mer popup och felkontroll i newtask sidan
fixed button layouts on newOrderActivity
Merge pull request #14 from TobyPalmer/christoffer

Mer popup o felkontroll
liten konflikt
Database class is done, Block/Order class update
layoutfix på newOrderView
layoutfix på newOrderItem
Merge pull request #16 from TobyPalmer/Tobias

Tobias
R.java
mergefix
Merge branch 'Jimmie'

Conflicts:
	TimeManagement/src/com/example/timemanagement/model/Block.java
Minor change