general refucktoring of constants and configurable values
idea prject files, need to figure out how to ignore/remove these from github

(cherry picked from commit a8452df465177a117313f2307a553f7e9caf2b0c)

Conflicts:
	.idea/uiDesigner.xml
Merge remote-tracking branch 'origin/master'