Fix PasswordModel and sfadmin
Added script for creating user avatars

All silhouettes (in orig-*.png) taken from the free-to-use silhouettes at
http://all-silhouettes.com/free-vector-animals/. The terms of use at
http://all-silhouettes.com/tou/ state "You are free to use it [that is,
the silhouette file] for personal or commercial purposes", and goes on
to state that using the silhouettes as part of any other graphic design
is also fine. So by using these as avatars, we're in compliance with the
author's license terms.

To create the avatar images in src/images/avatar, first make sure that
ImageMagick is installed ("sudo apt-get install imagemagick" on Debian
or Ubuntu), then run this script from the src/scripts/avatars directory.
Typo fix in create-avatars.sh
Make git ignore auto-created avatars

If we aren't committing the auto-created avatar files to the git repo,
we should add them to .gitignore so we don't spam ourselves with
hundreds of uncommitted files every time we run "git status".
Add built avatars to repo

This might cause some repository churn as we remove and add avatars
from time to time (or change their colors), but this is the best way to
deploy them with our current deployment system.
Merge remote-tracking branch 'origin/master' into feature/changepassword

Conflicts:
	src/angular-app/common/js/services.js
	src/models/PasswordModel.php
	src/service/sf.php
Merge remote-tracking branch 'origin/feature/avatars' into feature/changepassword
avatar dropdown in user profile is now working / persisting