Move more class stuff from User to Account
Merge branch 'develop' into account
Merge branch 'develop' into account
Merge develop to account
Cache in Account class (no longer User, but is User objects)
Merge ethan's set moves to new event system