Merge branch 'master' of https://github.com/eliu03/WelHair

Conflicts:
	src/www/api/routes/message.php
	src/www/library/Welfony/Controller/API/MessageController.php
	src/www/library/Welfony/Repository/MessageConversationRepository.php
Merge branch 'master' of https://github.com/eliu03/WelHair