changes card markup and adds ajax property editing
merged upstream
Merge remote-tracking branch 'upstream/master'
small fix
Merge remote-tracking branch 'upstream/master'
Merge branch 'jos-fork' into jos-integration