gitignore
added stuff
gitignore
merge-fix
Added defaultOrdernr to a new block
Merge branch 'master' of https://github.com/TobyPalmer/Agilen
Merge branch 'master' into hanna
Update .gitignore
Update Order.java
Update activity_neworderpopup.xml
Merge pull request #69 from TobyPalmer/hanna

Hanna
removed unused import
mergefix