updates assets table and locks down assets controller
 Merge branch 'master' of github.com:clemensp/majordomo