Revert "Initial Import"

This reverts commit ca2f75942c003e41e53341e97bbc261987bb5cde.
Merge branch 'master' into develop