working on setting avatar
working on setting avatar
Merge branch 'develop'

Conflicts:
	modules/opsModule/controllers/profileController.php
	modules/opsModule/views/view/profile/indexView.phtml
working on setting avatar
Merge branch 'develop'
Merge branch 'develop'
@ submodules: updated