Merge pull request #1 from miguelut/develop

Initial django project commit.
added yeoman generated angular app scaffold
Merge pull request #3 from miguelut/dev

testing pull request (merging temp branch dev into main develop branch)