userListItem changes
Merge branch 'master' of https://github.com/oligafner/4-for-2

Conflicts:
	collections.js