Merge remote-tracking branch 'origin/master' into working_branch

Conflicts:
	.idea/codeStyleSettings.xml

renamed and moved expressions and conditionals files into main directory
added 11 unversioned files to Git.