major code reformat
Merge branch 'hotfix/formatCodeTeams'
Merge tag 'tagsformatCodeTeams' into develop

major code reformat after team implementation

Conflicts:
	MVC/controller/userController.php