Merge origin/master
Modify origin/master
Merge origin/master

Conflicts:
	nbproject/project.properties
	protected/runtime/application.log
Merge origin/master

Conflicts:
	nbproject/project.properties
	protected/runtime/application.log
Merge origin/master

Conflicts:
	nbproject/project.properties
	protected/runtime/application.log