Card/Category associations
category index
Merge remote-tracking branch 'origin/master'
Live updating card template
Allow direct request for a specific card
Get template list client side for the card creation/editing page
Send card being edited to the client
Don't show template selection if editing a card
category add/delete
Merge remote-tracking branch 'origin/master'
Update sails version
Set migrate setting to make sails stop complaining
Link card with it's template rather than just the id
Merge branch 'master' of github.com:GlassJournalism/node-genius

Conflicts:
	config/routes.js
Fix routes.js duplicate issue
Fix isJson to wantsJSON
various card stuff
switch to document.ready
HAVE TO CALL populate ON THE FIND REQUEST TO LINK THE ASSOCIATED TEMPLATE WITH THE CARD
Merge branch 'master' of github.com:GlassJournalism/node-genius