Deleted old files
Some minor changes
Merge branch 'dev' of github.com:kostrub/web_intel into dev