Merge branches 'chris' and 'master' into chris
added has_many components relationship
added belongs_to user relationship
Merge branches 'master' and 'chris'