Moved common.js content into separate collections
Merge branch 'master' of https://github.com/jeffreysharris/ProfessorPeanut

Conflicts:
	collections/Users.js