local change
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/scope/wrapper/DatabaseHelper.java
	src/scope/wrapper/view/View.java
	src/scope/wrapper/view/View2.java
	src/scope/wrapper/view/View3.java