Merge pull request #36 from ten-forward/macosx

Macosx
Update ST2 workspace
more bonuses
fix travis
fix travis
Merge
Fix Makefile on lnx
Merge
Fix time travel
Merge pull request #37 from ssrb/master

Fix time machine
Cleanup
Dashboard part 1
Fxup
Merge pull request #38 from ssrb/master

Dashboard
Dashboard bomb count
Merge pull request #39 from ssrb/master

Dashboard bomb count
Rename test assets folder
test => drawable
Merge pull request #40 from ssrb/master

Renaming ressources
fix not letting go of the script file