- Small changes in User and Accounts classes
Merge origin/master