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..
small changes
merge
Merge branch 'russian' into Dev
added a pop up with a neutral ok-button for writing game playing instructions in
no changes
mergefix
onclick method for about button set to howToPlay