added setup.py
Merge branch 'develop' into feature/setup_py
Merge branch 'feature/setup_py' into develop
cleaned up the templates.
clean up spacing in code.