- moving to Java 8
- some small refactorings, cleaning code
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app.iml
- removing iml project files
- ignoring iml project files
S-2 Create import file for Rorschach blots
S-2 Create import file for Rorschach blots
S-5: Recover rorchach test enumerations (incomplete)