Version Bump
Merge branch 'development'
Merge branch 'development'
Version Bump
Add massive_settings button translate
refactor links in menu with dropdown
Merge branch 'master' of github.com:sequre/sequreisp
Merge branch 'development'
Join edit/delete columns for better layout
Fix logic, in order to run once a minute
Exit thread if daemon gets killed
Merge branch 'master' of github.com:sequre/sequreisp

Conflicts:
	app/views/layouts/partials/_menu.html.erb
Fix reference to missing method
Take both up/down traffic into account, and contemplate iptables_tree_optimization_enabled
Adding traffic from transparent proxy if active
Version Bump
SQL optimizations on traffic accounting
Merge branch 'master' into development