Merge remote-tracking branch

Conflicts:
	nbproject/private/private.xml

Screenshot_view

private
p
Merge remote-tracking branch 'origin/master'

Conflicts:
	nbproject/private/private.xml