Topological and Non-Topological Solitons in Scalar Field Theories