FIXED view-profile bug
Merge branch 'master' of github.com:josephktcheung/grasshopper into old-master

RESOLVED Conflicts in	app/assets/templates/view-profile.html.slim
Merge pull request #45 from josephktcheung/old-master

Old master
UPDATED angular_config
Merge pull request #46 from josephktcheung/update_factory

UPDATED angular_config
UPDATED factory and related controllers
Merge pull request #47 from josephktcheung/update_factory

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

UPDATED User factory loadCurrentUser and related controllers