Fixed demo past 28 days bug
Merge remote-tracking branch 'origin/clin_20131113_merge' into clin_20131113_merge