Added "Temporal Ripples" merge.
Added "Waterbolt" and "Ice Lance" merge.
Added POWER_TYPE_FEL_ENERGY color.
Hide power value if it does not exist.
Merge branch 'master'