new methods in dao/service. show/hide content button
Merge remote-tracking branch 'origin/master'