Changes for 4 July 2013

Created new categories and roles model. 

Note - changes have already been pushed to Heroku

+ Minor changes