Readding the refactoring to MVP of UserAccountActivity
Fixed AndroidManifest for UserFinanceAccountActivity to work
fixed conflicts