Merge remote-tracking branch 'upstream/master'

Conflicts:
	res/customconfig/customconfig.xml
Merge remote-tracking branch 'upstream/master'
Nightmare Governor new settings and some adjustments!
Fixed Customconfig that doesn't work. My mistake :)
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:Alucard24/initramfs3
Some customconfigs restrictions!