Merge remote-tracking branch 'upstream/user'
Merge remote-tracking branch 'upstream/user'
Merge remote-tracking branch 'upstream/user'
Merge remote-tracking branch 'upstream/user'
Merge remote-tracking branch 'upstream/user'
User module profile and homepage
Merge remote-tracking branch 'upstream/user'
Merge remote-tracking branch 'upstream/user' into user
User module compound edit page
Merge pull request #219 from sexnothing/user

User