Added TODO manage link
Merge branch 'feature/manage' into develop
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	index.php