Nick and username are not the same

username is very important for parse.com and we decided to use username
and nick
Merge remote-tracking branch 'origin/dej-branch'