junk
pull changes from dev
pull changes from dev
Merge branch 'dev' of https://github.com/anthonycorradi/binview into controller
Merge branch 'dev' of https://github.com/anthonycorradi/binview into controller
Merge branch 'dev' of https://github.com/anthonycorradi/binview into controller
Fixing details bug for Tanks, Locations, and Gateways
Merge branch 'dev' of https://github.com/anthonycorradi/binview into controller
update isAuthenticated and add SessionTimout to static controller
Merge branch 'dev' into security