Heads up: option to disable in lockscreen (2/2)

Change-Id: Icbc6fba1727c009f7ea42a66ea3167f19d527e10

Conflicts:
	res/values/cr_strings.xml
	src/com/carbon/fibers/fragments/sb/HeadsUpSettings.java

Change-Id: Ie8b569b4fe6cb52768a63938dcb8772c4965fb7d
Carbon Fibers: Add German Translation

Thanks to all the helper on Crowdin.

Change-Id: I894e27125b2af985a4070279678ced85252e5d5e
HeadsUp: option to launch in floating window (2/2)

Conflicts:
	res/values/cm_strings.xml
	res/xml/heads_up_settings.xml

Change-Id: I31c861d2013258fa462da191d3c8df1d2aee1a88
Merge remote-tracking branch 'carbon/kk' into kitkat