minor change
Merge branch 'master' of https://github.com/16twenty/axess

Conflicts:
	application/views/scripts/portalparts.php