Merge: Disable App Nap on OSX 10.9+

Conflicts:
	share/qt/Info.plist.in

Conflicts:
	share/qt/Info.plist