The Megapixel war will never be over. Pixelnumbers will increase and the size of the pixel decrease. One of the downside is that the diffraction limit will get worser and worser. Sony had an idea on how to use a special refractive element positioned between the lens and the sensor. You can read more at Egami (google english translation).