add files
create class - City
edit class - User
edit model
...
+ refactoring
+ refactoring
+ refactoring
+ refactoring
...
rest
test
commit
+ import files
+ import
+ import
add break
...
Merge branch 'test' into new_master