[AE/CA] - implement streamsilence flag (releases powermanagement assertion which is hold since lion even when holding a shared audio device open)
Add key mapping for the power button
Add support for sleep key in Linux
Move the Nyxboard sleep key mapping to the main keymap
Use key name not id in the Nyxboard mapping for F4
[Confluence] fix: remove invalid includes
[Confluence] fix: remove deprecated code
Merge pull request #2077 from jhsrennie/sleepkey

Add support for the power and sleep buttons
Merge pull request #2075 from Memphiz/streamsilence

[AE/CA] - implement the advancedsetting for streamsilence
VampireAE fixes, mmm'kay
Merge pull request #2084 from ronie/confluence-cleanup

[Confluence] cleanup
Merge pull request #2061 from davilla/vamp-fixes

VampireAE fixes, mmm'kay
[vda] revert back to intel greenline which is better than goofy framedrops for all
Revert "[aml] addons: deprecate plugin/script ability to set player."

This reverts commit fee0e90be13f34c6a19829cc4623acb154c529fd.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	xbmc/Application.cpp
	xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
	xbmc/cores/IPlayer.h
	xbmc/cores/amlplayer/AMLPlayer.cpp
	xbmc/cores/amlplayer/AMLPlayer.h
Remove twice declared lock
Merge branch 'master' of github.com:josebiro/xbmc

Conflicts:
	xbmc/cores/amlplayer/AMLPlayer.cpp