Added twitter oauth support
Merge branch 'master' of github.com:metaLayer/metaLayer-enterprise into mux

Conflicts:
	settings_demod8a.py

	modified:   settings_demod8a.py
Merge branch 'up' of github.com:metaLayer/metaLayer-enterprise into up

Conflicts:
	settings_demod8a.py

	modified:   settings_demod8a.py