Merge remote-tracking branch 'origin/master'

Conflicts:
	src/app/MainClass.java
	src/resources/database.properties