Fixed the eclipse workspace finally. I promise.
Merge branch 'origin/master'