Added inclusion of needed AES libs
Merge remote-tracking branch 'origin/master'

Conflicts:
	plugin/chrome/manifest.json