Fix #35
Fix #35
Setup email delivery
Merge branch 'issue35_mail' of github.com:EBU-TI/OSCIED into issue35_mail
Merge branch 'master' into issue35_mail

Conflicts:
	charms/oscied_lib/Orchestra.py
Merge branch 'master' into issue35_mail

Conflicts:
	charms/oscied_lib/Orchestra.py
	charms/oscied_lib/PublishTask.py
	charms/oscied_lib/TransformTask.py
Deliver e-mail partially implemented, missing e-mail templates + unicode boring problems
Merge branch 'master' into issue35_mail

Conflicts:
	charms/oscied-orchestra/local_config.pkl
	charms/oscied-orchestra/orchestra.py
	charms/oscied-orchestra/revision
	charms/oscied_lib/Media.py
	charms/oscied_lib/Orchestra.py
	charms/oscied_lib/OrchestraConfig.py
	charms/oscied_lib/OrchestraHooks.py
	charms/oscied_lib/PublishTask.py
	charms/oscied_lib/TransformTask.py
Merge branch 'master' into issue35_mail
Update pyutils + scenarios, must re-test before -> master
Update (to fix) generate-doc.py
Fix anoying problem with pip+rednose (python3 vs python2 !)
Install libyaml-dev
Update Git ignore list
Ensure the usage of "local" version of libraries (oscied_lib, pyutils)
Merge IBC client and scenario, update pyutils
Merge branch 'master' into issue35_mail

Conflicts:
	charms/oscied-orchestra/local_config.pkl
	charms/oscied-orchestra/revision
	charms/oscied_lib/Orchestra.py
	charms/oscied_lib/OrchestraConfig.py
	charms/oscied_lib/PublishTask.py
	charms/oscied_lib/TransformTask.py
	scripts/menu.sh
Merge branch 'dev' into issue35_mail
Add send_email attribute
Ensure unicode + load foreign models only if an e-mail should be send