added ignore /nbproject/private
Revert "added ignore /nbproject/private"

This reverts commit 6a3ae60b3c84a0fc684bd3890a1ce0ac8eaddc1a.
Revert "Revert "added ignore /nbproject/private""

This reverts commit 1474e072cb0d904284812f3444cdedb662b1df89.
Revert "added ignore /nbproject/private"

This reverts commit 6a3ae60b3c84a0fc684bd3890a1ce0ac8eaddc1a.
deleted profile.jsp
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/includes/Profile.jsp