Removed a copy of the README-file and updated README.
Changed usage of Model to MapModel. Fixed nullpointer.
Resolved merge conflict
Hopefully fixed nullpointer
Merge branch 'dev-model' into dev
Merge branch 'dev-home' of ssh://git@github.com/Farenheight/Lidkoping-SH.git into dev-guitasks-tiertwo
Changed data in spinner
Fixed a bug where the ScrollLayout accidentally were used on both tabs.
Added taskId on Task.
Updated README.
Merge branch 'dev-home' of ssh://git@github.com/Farenheight/Lidkoping-SH.git into dev-home
Compilation problems with Task constructor.
Updated photo view lib, might be startup delay problem
Merge branch 'dev-home' into dev
Fixed bug with tasks in database.
Merge branch 'dev' of ssh://git@github.com/Farenheight/Lidkoping-SH.git into dev
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.