Converting from Serializable to Parcelable.
resolved conflicts
Merge branch 'tslamic-parcelable'