Merge pull request #52 from ChrisBoesch/master

update
Updating Tournament controller
Merge pull request #343 from ruijunhuang2010/master

Merge pull request #52 from ChrisBoesch/master
Merge pull request #53 from ChrisBoesch/master

update
profile badge display
Merge pull request #344 from ruijunhuang2010/master

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

make sure private message editable
Update controllers.js
Merge pull request #346 from ruijunhuang2010/master

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

Updates