added a note pointing to the branch
working on the graph settings
Merge branch 'master' into namespacing
Merge remote-tracking branch 'origin/namespacing' into namespacing

Conflicts:
	www/Netmrg/Controller/SettingsController.php
merging fixed conflict
Merge remote-tracking branch 'origin/namespacing' into namespacing