(bug) set collectionFactory.collection.links to []
Merge branch 'master' of https://github.com/NiteOut/curates

Conflicts:
	client/modules/singleCollection/singleCollection.js
Merge pull request #15 from jimjea/master

created password hashing and token generating
Merge branch 'master' of https://github.com/NiteOut/curates
Merge pull request #16 from robotBones/master

(bug) angular voteLink interface to server changed
fixed linking error
fixed collection controller... again...
removed debug log
updated tokening system to allow user relog
updated color palette, and updated collectionController
Extreme makeover curates edition
changed title font
Merge pull request #17 from jangahroo/master

Extreme makeover
Deleted unused server files