Merge remote-tracking branch 'origin/master'

Conflicts:
	src/app/AppMain.java
	src/app/InsertView.java
	src/properties.xml