Timer

-- Untested Changes --
TimerTask contains a branch for pausing the program (do nothing in the TimerTask)
Reincluded onPause() and onResume() which can change a boolean variable (running)
Timer

-- Still Untested Changes --
On Stefans  proposal last changes are now synchronized.
Timer

-- Untested Changes --
TimerTask contains a branch for pausing the program (do nothing in the TimerTask)
Reincluded onPause() and onResume() which can change a boolean variable (running)
Timer

-- Still Untested Changes --
On Stefans  proposal last changes are now synchronized.
Timer

-- Still Untested Changes --
Internal Clock implemented, more Parameters in GlobalInformation.
Clock

-- Still Untested Changes --
Internal Clock implemented, more Parameters in GlobalInformation.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/example/Demo_Subj/RoomActivity.java
Timer

-- Untested Changes --
TimerTask contains a branch for pausing the program (do nothing in the TimerTask)
Reincluded onPause() and onResume() which can change a boolean variable (running)
Timer

-- Still Untested Changes --
On Stefans  proposal last changes are now synchronized.
Timer

-- Still Untested Changes --
Internal Clock implemented, more Parameters in GlobalInformation.
Clock

-- Still Untested Changes --
Internal Clock implemented, more Parameters in GlobalInformation.
GlobalClock

-- Still Untested Changes --
Bug solved (no change of Variable "day")
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/example/Demo_Subj/RoomActivity.java
GlobalClock

-- Still Untested Changes --
Clock in seperate class
World

-- Still Untested Changes --
Class for easy accessing of rooms and objects.
Small Improvements in RoomActivity.
Grafiken und XML
World

-- Still Untested Changes --
Improvements in World.java, read the comments
Merge pull request #21 from snapesnap/master

make KI conform to project style
Merge pull request #22 from snapesnap/master

Style guide changes in Need and Intelligence
Style Sheet

KI umbenannt und angepasst an den Style Sheet von Google.
Attribute und Funktionen umbenannt.