Hybrid Core updated to 1.6 (Master Branch)

Signed-off-by: Bryan Hoffman <bryan@spigotdesign.com>
404 and sidebar-before-content templates added

Signed-off-by: Bryan Hoffman <bryan@spigotdesign.com>