+
Merge branch 'master' into list

Conflicts:
	recentcats/index.php
add dashboard
formatting