Updated license details.
Merge remote-tracking branch 'origin/master'

Conflicts:
	NOTICE
	pox/web/jsonrest.py