Add LWJGL so it can compile
Merge remote-tracking branch 'origin/master'

Conflicts: