Changed footer.tpl
Changed credits file
bug fix when saving user status
changed footer.tpl
Merge branch 'upstream/master'
Merge branch 'origin/master'
Merge branch 'master'