Merge conflict
Merge branch 'master' of https://github.com/dbecker1/Service

Conflicts:
	nbproject/private/private.xml