WCMS-143 Changed author to be a Person instead of a User.
Merge branch 'master' into article_author

Conflicts:
	spec/lib/buweb/article_spec.rb
Merge pull request #50 from biola/article_author

WCMS-143 Changed author to be a Person instead of a User.