huge update
ion
transition into cm
Revert "ion"

This reverts commit 5cc2caf5aeca249f84b9274ecc4c6764d9e2a12d.
Staging for AOKP
More For AOKP
ion