Getting ready for 1.5.2
Merge remote-tracking branch 'origin/aside'
Changed UI to OS "Look and Feel"
Merge remote-tracking branch 'origin/aside'
Merge
Jar update
Merge remote-tracking branch 'origin/aside'
Merge remote-tracking branch 'origin/aside'
Merge remote-tracking branch 'origin/aside'
Jar Updated
testing out travis
Java ant build
Merge remote-tracking branch 'origin/aside'
Cleared tile id conflict