Modify manage home page
Merge remote-tracking branch 'origin/master' into story-9

Conflicts:
	qsystem/investmanager/views.py
Fix merge bugs