Advanced cathodes and electrolytes for lithium-ion and lithium-air batteries