Merge branch 'develop'
fix /site/showRecord template