Add true and false as logical constants
Merge branch 'master' into TrueAndFalseAsLogicalConstants

Conflicts:
	catroid/res/values-de/strings.xml
	catroid/res/values/strings.xml
	catroid/src/org/catrobat/catroid/formulaeditor/FormulaElement.java
	catroid/src/org/catrobat/catroid/formulaeditor/Functions.java
	catroid/src/org/catrobat/catroid/formulaeditor/InternFormulaKeyboardAdapter.java
	catroid/src/org/catrobat/catroid/formulaeditor/InternToExternGenerator.java
	catroid/src/org/catrobat/catroid/ui/fragment/FormulaEditorListFragment.java
Move TRUE and FALSE to Logic
Fix Issue#319
Fix test cases
Merge branch 'master' into Issue#319
Merge pull request #354 from Catrobat/TrueAndFalseAsLogicalConstants

Add true and false as logical constants #309
Merge pull request #370 from Catrobat/Issue#319

Fix for Issue#319
Merge branch 'master' into issue#269