repair indentation and NULL comparisons in Avatar class
Merge pull request #500 from birarda/master

indentation and NULL comparison repairs in Avatar