username in battle
dynamic messaging via salil + elaine
Merge branch 'develop'