Remove redundant code and tidy code formatting
Merge branch 'master' of https://github.com/jnears/societycentral

Conflicts:
	sidebar.php