CMAccount: Remove "or" between account buttons

* Fixes issue described here http://review.cyanogenmod.org/64052
* Same as google's setup wizard

Change-Id: I4677f946130edb525e4c7ce49090ad63c06dc1a9
CMAccount: fix setup wizard crash

In the case when navigating through
the setup wizard quickly, sometimes
CMAccount would crash when trying to
reinstantiate the personalize
fragment.

Change-Id: I1cd0d0cc5fab41b882b26744bdc9614e096c47d1
Signed-off-by: Roman Birg <roman@cyngn.com>
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_CMAccount into cm-11.0