Merge pull request #13 from mikegiberson/master

Grab Tram's stuff
Administration Guide

2/3 dones
Merge pull request #44 from syhc/master

Admin Guide