remove trail spaces and white space
Merge branch 'master' of github.com:pbearne/wp-author-avatars

Conflicts:
	author-avatars.php
	lib/UserList.class.php