Update .gitignore
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
Merge branch 'master' into christoffer
Merge branch 'Jimmie'

Conflicts:
	TimeManagement/src/com/example/timemanagement/model/Block.java
Minor change
Ignoring .orig files
Merge branch 'master' into christoffer
database sync with GUI