starting border touches
joining code to new local rep
base for merge
in teh middle of arrows... before redcing PathController API heavily
... arrows...
Merge branch 'leif3' into beta

Conflicts:
	Jarvizz/Jarvizz/Jarvizz.csproj
	Jarvizz/Jarvizz/Player/Controller/PresentationLoader.cs
	Jarvizz/Jarvizz/View/Pages/PlayerPage.xaml
	Jarvizz/Jarvizz/presentationData/defaultPresentation/defaultPresentation.xml
	Jarvizz/defaultPresentation/defaultPresentation.xml
merging...
new presentation file
connection and more stuff
..