added school_id to investments
prepare to merge
made dynamic tabs
Fixed merge conflicts