edit profile
Merge branch 'master' of https://github.com/venturepact/platform
changes with relation
changes for edit
edit profile
changes for framework
css changes
changes for remove
Merge branch 'master' of https://github.com/venturepact/platform

Conflicts:
	protected/controllers/UserController.php
new images
changes
changes
button