added __init__.py files to all packages
Merge remote-tracking branch 'origin/master'