Fix comparison, merge interfaces

Merge interfaces of the same device which have the same IP into one
interface.
Merge branch 'master' of github.com:FFM/FFM