reactivate feature is added
Merge pull request #446 from goutham-M/mifosx-499

reactivate feature is added
mifosx-476 make portfolio permissions not grotesque
mifosx-476 make portfolio permissions not grotesque (amendment)
Merge pull request #447 from johnw65/perms

Perms
Merge remote-tracking branch 'upstream/develop'