Design changes to master by Evonne 28 Aug 2014 (Bug #1252085)

Change-Id: Ia7d3759acd3deb1224782970ebde5f5f8e6a08e8
Signed-off-by: Robert Lyon <robertl@brumbies.wgtn.cat-it.co.nz>
Signed-off-by: Ghada El-Zoghbi <ghada@catalyst-au.net>