Merge branch 'developer' into graphics
Logo + button

Palpointer and two buttons
Merge branch 'graphics' into developer
logout and update coordinates
Undoing changes - wrong branch
Merge branch 'developer' into coordinates

Conflicts:
	AppPalPointer/src/com/example/palpointer/ToDoActivity.java