UPDATED User factory loadCurrentUser and related controllers
Merge pull request #48 from josephktcheung/update_factory

UPDATED User factory loadCurrentUser and related controllers