bug fixing
Merge branch 'deckComments' of http://github.com/StyleASD/team_citadel into deckComments
Demo curse continues :(
Merge branch 'master' into deckComments