cleaning up (removing unnecessary folders, includes, etc.)
removed remaining errors (according to IntelliJ Code Analyser)
Merge remote-tracking branch 'origin/master'

Conflicts:
	battleship/src/battleship/view/Position.java
code cleanup: not needed return values, improved visibilities
Merge remote-tracking branch 'origin/master'