Small fix to reset the buttons (flag/agree/disagree); Incorporated waitAndClick into automated tests
Changed the icons for the filters.
Merge branch 'frontend' of https://github.com/StickMen/KungFuRhino
Comment out AdminHistory code from UpdateNarrative() temporarily (show stopper)
Mozilla Recorder bug fix
2 Defects fixed in the narrative recorder
Removed stop button. Made new filter icons. Changed the filter active icons.
Merge branch 'frontend' of https://github.com/StickMen/KungFuRhino
Tool Tips and minor bug fixes
Completed the main page.
Merge branch 'frontend' of https://github.com/StickMen/KungFuRhino
Fixed the jplayer to retrieve the right amount of audio and fixed the seek bar lag.
Reordered filter buttons.
Merge branch 'backend-new'
Merge branch 'dev'
Fixes to compiling issues
Added tooltips to the player buttons and created new icons for mute and unmute.
Merge branch 'frontend' of https://github.com/StickMen/KungFuRhino
Progress on fading content
fixed the flag, changed the thumbs, added the agree/disagree bar (incomplete)