Commit 4a63ec534ea21853d0b92e830a65d373f49e00b1

Tom St Denis 2015-10-30T18:12:13

Merge branch 'feature/doc' into develop Signed-off-by: Tom St Denis <tstdenis82@gmail.com>