Fix merge conflicts and update with latest version of console.
Merge branch 'development' of github.com:jerrywei123/RockBandTouringApp into development