changes to create

Signed-off-by: Eric Poirier <eric@ericpoirier.ca>
minor
Merge branch 'refs/heads/Eric' into Pete

Conflicts:
	application/controllers/profile.php