articles can now be locked
Fixed some formating issues.
Merge branch 'master' into css_fixes
Articles can be rolled back now
Merge branch 'master' into lockArticles
added Unique validation for Category name
formatted
Merge branch 'master' into rollBack
category links now work.
contributing users
Merge branch 'master' into contributingUsers
merge active record issues