Fixed LinkPhase bugs
deleted
Merge branch 'master' of https://github.com/timohtey/Memoir.git

Conflicts:
	src/com/example/memoir/LinkPhaseActivity.java