[FIX] String to long for Date
[UPDATE] Unit Test
[FIX] Conflicts
Merge branch 'master' of https://github.com/bryantylai/FYP-Server

Conflicts:
	ApolloAPI/ApolloAPI/Controllers/Client/UserController.cs
	ApolloAPI/ApolloAPI/Services/UserService.cs