updated report module
fixed conflicts
Merge pull request #35 from SteveLobdell/master

Added ajax to index page