basic profile edit
Merge branch 'master' of https://github.com/QuantumHive/DataDate

Conflicts:
	application/config/routes.php
	application/controllers/database.php
	application/controllers/profile.php
	application/db/database3.sqlite
	application/views/templates/header.php