(ABM-535) removed redundant codevdf.rsc
Merge branch 'develop' of local repository into wsu
Merge branch 'wsu' into develop