fixed logic and design for log an activity controllers
Merge remote-tracking branch 'origin/master'