Merge pull request #391 from kwanggithub/master

Fix NPE in LoadBalancer
Remove host address configurations from properties file.
Merge pull request #392 from vy/patch-2

Remove host address configurations from properties file.
Squashed commit of the following:

commit cb82c17554a8dee3916703cf4234722ce070234a
Author: KC Wang <kc.wang@bigswitch.com>
Date:   Mon Apr 1 17:05:46 2013 -0700

    Fix NPE due to missing dependency declaration of IDebugCounterService in Controller.java

commit a96ac320521d0158b2e4c4a0f0699a57e04e0095
Merge: 2b15372 33c6839
Author: Gregor Maier <gregor.maier@bigswitch.com>
Date:   Fri Mar 29 16:50:03 2013 -0700

    Merge remote-tracking branch 'bigswitch/master' into misc

    Conflicts:
    	bigfloodlight/src/main/java/com/bigswitch/floodlight/bvs/virtualrouting/internal/DhcpManager.java

commit 2b1537245854bd63081e7bad5e2ebaaaa74caa0f
Author: Gregor Maier <gregor.maier@bigswitch.com>
Date:   Fri Mar 29 16:42:24 2013 -0700

    Always use instanceof before casting

commit 33c6839dad900ce00bfe800880eff9a90fa6460a
Merge: 0a68715 3c73ea9
Author: Saurav Das <saurav.das@bigswitch.com>
Date:   Thu Mar 28 12:51:21 2013 -0700

    Merge branch 'master' of github.com:sd2/bigswitchcontroller

    Conflicts:
    	floodlight/src/main/java/net/floodlightcontroller/debugcounter/DebugCounter.java
    	floodlight/src/main/java/net/floodlightcontroller/debugcounter/DebugCounterGetResource.java
    	floodlight/src/main/java/net/floodlightcontroller/debugcounter/DebugCounterResetResource.java
    	floodlight/src/main/java/net/floodlightcontroller/debugcounter/DebugCounterStateResource.java

commit 0a687157eced22340fa50c021f6e966cb108fd5c
Author: Saurav Das <saurav.das@bigswitch.com>
Date:   Thu Mar 28 12:39:37 2013 -0700

    trivial change in comment

commit 15c7d257797d11591e29723fb69b7fccaf2ef46d
Author: Saurav Das <saurav.das@bigswitch.com>
Date:   Thu Mar 28 12:32:20 2013 -0700

    completing the REST-API for debug counters and fixing a bug

commit 08ded87fa68e15117f8bb51f32f625345bbdd173
Author: Saurav Das <saurav.das@bigswitch.com>
Date:   Wed Mar 27 20:01:50 2013 -0700

    Implementing the REST-API for debug counters

commit 040b98ea8f9c497b66ccaef16a8285c16808f38f
Author: Saurav Das <saurav.das@bigswitch.com>
Date:   Tue Mar 26 22:00:54 2013 -0700

    Implementing the rest of the debugCounters API

commit 47c0d31c92d947b298752c5dd173fc62bd2fd71c
Author: Shudong Zhou <shudongzhou@gmail.com>
Date:   Thu Mar 28 00:06:09 2013 -0700

    Make all channel writes go through a single function, allow override

commit a79b3ffad3a6043e814224b72ffcb3e4bd63a716
Author: kwanggithub <kwang@clemson.edu>
Date:   Wed Mar 27 21:05:31 2013 -0700

    fixing white space in NoOp.java

commit 3c73ea9fd59867a4a427d244b2fac406866feef3
Merge: b9f1f5a 35ed1d4
Author: Saurav Das <saurav.das@bigswitch.com>
Date:   Wed Mar 27 20:08:49 2013 -0700

    Merge branch 'master' of github.com:sd2/bigswitchcontroller

    Conflicts:
    	floodlight/src/main/java/net/floodlightcontroller/debugcounter/DebugCounter.java
    	floodlight/src/main/java/net/floodlightcontroller/debugcounter/IDebugCounterService.java

commit b9f1f5a3a4624e24ec504cfaeb28ce02ffc75364
Author: Saurav Das <saurav.das@bigswitch.com>
Date:   Wed Mar 27 20:01:50 2013 -0700

    Implementing the REST-API for debug counters

commit 79b9805d137d5ac40617d05d62817e9857491905
Author: Saurav Das <saurav.das@bigswitch.com>
Date:   Tue Mar 26 22:00:54 2013 -0700

    Implementing the rest of the debugCounters API

commit 35ed1d4e919b03055fbd36ec247faad1ceb4dd18
Author: Saurav Das <saurav.das@bigswitch.com>
Date:   Tue Mar 26 22:00:54 2013 -0700

    Implementing the rest of the debugCounters API