Commit because github said i had to

I had no choice in this
there isn't even anything here to commit...
Merge remote-tracking branch 'origin/master'

Conflicts:
	WorkInProgress/dist/WorkInProgress.jar
	WorkInProgress/dist/lib/controlsfx-8.0.6_20.jar