Major commit 26-07-2013

Lots of things change after we decide to integrate Portal + PMS.