Merge branch 'collapsedState'
Merge branch 'master' of git://github.com/marbindrakon/eve-wspace into develop
Add view to clear scanner table
Add clearing to template for scanners

Also fixed bug with incrementing counter
Merge branch 'develop' into euni