untracked files on master: fbeed47 Save & Load
index on master: fbeed47 Save & Load
WIP on master: fbeed47 Save & Load
Merge commit '95e9a9e6843a0b3a94f36a2eaa8bab0f3144c0f8'

Conflicts:
	src/de/gymbuetz/gsgbapp/PlanFragment.java