Merge remote-tracking branch 'origin/master' into release/2.1b1
Fix activity model wall post notifications.
Add some css class information to the me box that themes can target.
Fix UserModel::GivePoints() sql.
Added per/category points option to category admin.
Merge branch 'release/2.1b1' into feature/category-points
SetCalculatedFields should run on GetID always, even if retrieved from cache.
Merge branch 'master' into release/2.1b1
Merge branch 'master' into hotfix/2.1a39
Fix dispatcher so that RESTRICT ONCE stack items are popped off correctly.
Note: Remove this in 2.2
Fix dispatcher so that RESTRICT ONCE stack items are properly consumed.
Merge branch 'master' into release/2.1b1

Conflicts:
	library/core/class.dispatcher.php
Revert UserModel to cached mode.
Revert UserModel to cached mode.
Fixed UX bug where signing in from /entry/signin would redirect back to /entry/signin.
Merge branch 'master' of github.com:vanillaforums/Garden
Properly apply calculated fields whenever a user is retrieved.
Merge branch 'master' of github.com:vanillaforums/Garden
Merge branch 'master' into release/2.1b1

Conflicts:
	applications/dashboard/models/class.usermodel.php
Be careful with SetCalculatedFields so as not to invalidate already-expanded serialized fields.