Maybe like
Merge branch 'master' of https://github.com/Lapixx/WT3

Conflicts:
	application/controllers/profiles.php