1. modify table view
2. mark nslog
Merge remote-tracking branch 'origin/poetryapps_development' into poetryapps_development