From Orthogonal to Non-orthogonal Multiple Access: Energy- and Spectrum-Efficient Resource Allocation - From Orthogonal to Non-orthogonal Multiple Access: Energy- and Spectrum-Efficient Resource Allocation