Changes for 4 July 2013

Created new categories and roles model. 

+ Minor changes