Merge pull request #344 from ruijunhuang2010/master

update
Merge pull request #345 from ruijunhuang2010/master

make sure private message editable
Merge pull request #346 from ruijunhuang2010/master

Update controllers.js
Merge pull request #11 from ChrisBoesch/master

update
Update Profile

- aligned profile div
- location flag appears on profile div
- quest, path, challenges & my challenges, stories divs collapsed for
small screen
Merge pull request #347 from Arathi298/master

Profile update
Edit Profile update

- player country shown
- tags display changed
Merge pull request #348 from Arathi298/master

Edit Profile update
Merge pull request #349 from ruijunhuang2010/master

update
Merge pull request #54 from ChrisBoesch/master

update