fixed string
fixed bitmap.java tostring for windows.  Removed buggy png
Merge origin/master