Squashed commit of the following:

commit 3dcd02cfb2f8b3feb07f6c63ded633cf00ec71f1
Merge: cb8ca45 54e49e5
Author: kwanggithub <kwang@clemson.edu>
Date:   Fri Dec 28 13:23:35 2012 -0800

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

commit 54e49e5813c04d950ede1d07e22d6508b42ba8df
Author: Sandip Shah <sandip.shah@bigswitch.com>
Date:   Fri Dec 28 11:59:32 2012 -0800

    Fixed tab characters issues

commit 6cc3b75f036fbfd9fbd4b6c17d759b8d2bacdefb
Author: Sandip Shah <sandip.shah@bigswitch.com>
Date:   Fri Dec 28 11:41:48 2012 -0800

    Fix the merge conflicts and compile warnings/failures

commit 261573a7a4322001849040780c3cd247ef81d4cb
Author: Sandip Shah <sandip.shah@bigswitch.com>
Date:   Fri Dec 28 11:23:25 2012 -0800

    This reverts commit 5e115c8ca4b12796f33b26ae6d0909459332f27f.

commit 3c9e71dbfd221accf86162dfdd66caefdfd82a42
Author: Sandip Shah <sandip.shah@bigswitch.com>
Date:   Fri Dec 28 11:09:31 2012 -0800

    This reverts commit 7a6776833b6a12f84321b2243e6c5ae393676383.

commit 9170f5b0d2eacb44d21cb1df9c4e8f0e202b4bc1
Author: Sandip Shah <sandip.shah@bigswitch.com>
Date:   Fri Dec 28 09:32:56 2012 -0800

    Fix for unit-test failure for Link Discovery Manager test.

commit cb8ca45484cfba13b05ea56ca1dfb6627985bc1b
Merge: a4cdc05 3fbea3d6
Author: kwanggithub <kwang@clemson.edu>
Date:   Thu Dec 27 17:55:22 2012 -0800

    Update Floodlight subtree

    Conflicts:
    	floodlight/src/main/java/net/floodlightcontroller/core/internal/Controller.java (fixed empty lines)

commit a4cdc059ebcd07a0e681dd0d564fb3a35c16eb19
Merge: 3af431d 599a4a33
Author: Sandip Shah <sandip.shah@bigswitch.com>
Date:   Thu Dec 27 17:12:45 2012 -0800

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

commit 3af431d401a53fec31a85b6af63836ed155700f0
Author: Sandip Shah <sandip.shah@bigswitch.com>
Date:   Tue Dec 11 18:08:57 2012 -0800

    BT-52 : Code check-in for tcam full handling. This will change the runtime status to reflect tcam full. It will also cleanup the policy.

commit 958f522f7be90aea76ec3f11ac11b89a5587d8b1
Author: Sandip Shah <sandip.shah@bigswitch.com>
Date:   Wed Nov 28 12:59:19 2012 -0800

    Commit