Updating user activity module layout
Merge branch 'master' of https://github.com/eaxs/User-Activity

Conflicts:
	modules/mod_useractivity_site/tmpl/default_j30.php
Fixing my screwed up merge