added method for setting craycray ill
main
nothing major
merge fix
code controll and corrections
Merge branch 'Dev' into ill_feature

Conflicts:
	CrayCray/src/se/chalmers/dat255/craycray/MainActivity.java
fixes
bug fix of picture-update
CrayCray now becomes sick and can die from illness

Added methods for making CrayCray sick and a counter that controlls how
long CrayCray can be sick before he dies. A pop-up shows up when he
dies with the window in focus. DatabaseAdapterTest is moved to the test
package.
fade half implemented
merge fix
Merge remote-tracking branch 'origin/bug_fix' into ill_feature
Changed the logic behind the illCount so that it is now the same as for hunger and so on..
Moved the test classes to a test source folder and added some stuff to the AndroidManifest to make it work
Merge branch 'Dev' into ill_feature

Conflicts:
	CrayCray/res/layout/activity_main.xml
	CrayCray/src/se/chalmers/dat255/craycray/activity/MainActivity.java
	CrayCray/src/se/chalmers/dat255/craycray/model/NeedsModel.java
Merge branch 'ill_feature' into Dev