changes
Merge remote-tracking branch 'ajde-github/master'

Conflicts:
	private/lib/Ajde/Resource/Image.php
various
Merge branch 'master' of github.com:nabble/ajde
email templates and google drive support for media files