Merge pull request #8 from kellyelton/test

Catching up with KellyElton Base
New Marker Calls and OnMarkerChanged event
Missed one
Remove files no longer included in def, when updating.
Fixed last second typo
Fixes #1199
Addressed #1157 - highlight and markers parameter for OnMoveCard

Plus more changes for the OnMarkerChanged event
OnMoveCard's markers paramenter is now a dictionary string, rather than a nested list.
Reorganized Options, Added "Card Pulse" Options
Catching up with KellyElton Base
Revert "Catching up with KellyElton Base"

This reverts commit 879622c7b3fb90c94cba0056c647313359da723d.
Minor
Missing csproj ftw
Merge branch 'test' of github.com:DarkSir23/OCTGN into DarkSir23-test

Conflicts:
	octgnFX/Octgn/Play/Actions/Action.cs
	octgnFX/Octgn/Windows/Options.xaml
	octgnFX/Octgn/Windows/Options.xaml.cs
	recentchanges.txt
Argh

There should be nothing in this commit.
Auto generated commit for version 3.1.126.274-Test
Merge branch 'test' of https://github.com/kellyelton/OCTGN into test
Little addition to the about window.
Removed scripts triggering events. Should get refactored soon as it's a bit ugly right now.
Merge branch 'test' of https://github.com/kellyelton/OCTGN into test