update smc-connect story
update recordtrac story
fixing conflicts
Merge branch 'develop' into map