updated module system
Merge branch 'master' of github.com:enkidulan/hangout_api

Conflicts:
	hangout_api/tests/TestBaseAPI.py