ngpestelos/SB-3327 — pull request #2 by keikun17 (2013-01-19 05:44:05+00:00)
Title: Fix Merge conflicts + Fix Broken links

Fix Merge conflicts + Fix Broken links