Get rid of max-height - no longer breaks newer versions of chrome, but does break showmore.
Get admin/users mostly working.  Still need to associate channels with accounts.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	view/theme/redbasic/css/style.css
Tidy up
Merge pull request #34 from beardy-unixer/master

Admin panel