1
Merge branch 'master' of https://github.com/VladiKiller/diplom

Conflicts:
	application/cache/a4/a4b50012e9a6c5200c40dc59b07a59c958d72207.txt
modules/email/vendor/swift/preferences.php