add .project to .gitignore file
Merge branch 'development'
Adding testbranch file for testing branches
adding code to test file
testing branching
minor comment change
Merge branch 'development'
fixing conflict with deve in comment
Merge branch 'development'
removing test file
updating and adding code to display help link next to public/private that goes to proper KB page for visualization
Making instructions show by default on data page and updating instructions
Adding delete button back on the bottom buttons and taking new away from bottom
Updating JS code to properly filter ALL data elements others plus own
Fix to OG user add form update to get it to properly add the designated role
Final updates to timeglider timeline code. Adding SHIVA folder with shiva player in it to have all the code for the module in one place
Adding help text and some styles to the timeline.htm file
update to detect when color picker is showing and not reload timeline
Rearranging Timeglider files. Putting images in img folder and css in top css folder.
Removing old files after rearrange