Finish account module
Apply latest master
Merge story 1, 2, 3, 4