Just merged Neo Portal to trunk (SAK-19813)

2:56pm May 3rd 2011 via web