bug #926 - add new feature
fix test
bug #926 - add user first name and last name to dropdown + cron script
add endpoint to cron script
bug #926 - update avatar
bug #926 - add two version of API for users view
bug #926 - remove .keys()
Merge remote-tracking branch 'upstream/master' into bug_926

Conflicts:
	setup.py
Merge pull request #6 from aadamski/bug_926

Bug 926