Merge pull request #1030 from rustyswayne/Refactor/M-502

Summary: Developing angular development pattern