Merge branch 'plugins' into disks
fix for integrity error when we have in DB Model with the same name and different type
better hd detection
clean
small bugfixes
fix
fix
fix in puppet plugin
Merge pull request #672 from deejay1/doc_fixes

remove some more trails of Celery from the docs
saving FC cards - fix
unused variable removed
scan - merge form - fix
scan merge form - saving disks and memory - fix
another fix...
Merge pull request #670 from andrzej-jankowski/master

bugfixes
ip address in load balancer addresses view
scan merge form - display improvement
Merge pull request #673 from inc0/f5-2

ip address in load balancer addresses view
Merge pull request #674 from andrzej-jankowski/master

scan merge form - some display improvement
component merger - in progress