admin class documentation
Merge origin/master

Conflicts:
	sandbox/www/css/style.css