Formatting
Updated Netty to 3.6.3
Reverted new Samsung AllShare changes until we can make better regexes