Moved all the String texts on buttons, labels etc. to FingerpaintConstants.java
Resolved merge conflicts in Fingerpaint and GuiState