stuff
Merge branch 'master' of https://github.com/QuantumHive/DataDate

Conflicts:
	application/controllers/database.php
	application/controllers/profile.php
	application/db/database3.sqlite
	application/views/content/editProfile.php
	application/views/content/profile.php
	application/views/dbAdmin.php
	application/views/templates/head.php
	application/views/templates/header.php
interests add/remove