Merge branch 'dev' into dev-layersql

Conflicts:
	src/com/example/lidkopingsh/database/OrderDbFiller.java
	src/com/example/lidkopingsh/database/OrderDbHelper.java
Compilation problem in OrderDbFiller fixed.
Created test for sort and where
Created test project
Merged in test project
Merged in test project