Added flexibility for different types of alerts
Merge branch 'frontend' of https://github.com/StickMen/KungFuRhino.git
Merge branch 'frontend' of https://github.com/StickMen/KungFuRhino.git
Frontend Testing additions and changes
Made some fixes.
Merge branch 'frontend-animation-integration'
automated tests for agree/disagree and flag
Fixed the player tooltip defect and compressed the default pic for narratives.
Updated fix for alert logic, added alerts for Agree/Disagree
Fixed the scrollbar bug.
Merge branch 'frontend' of https://github.com/StickMen/KungFuRhino
Merge branch 'backend-new'