merge from hell is done. added some new particle bitmaps. allegiance.