mamsoafm
Merge remote-tracking branch 'origin/master'

Conflicts:
	APIServer/ServerWeb/nbproject/project.properties