Virtual Student Profile for Virtual User
Merge branch 'social'

Conflicts:
	application/models/user.php
Merge branch 'master' of https://github.com/cxsshaw/beta_ci