Add a Product_Article model & ActiveAdmin Resource
Fixed user display bug
Merge branch 'taskTweaks'
Fixed user Display bug
Fixed user dropdowns display bug
Fixed dropdowns user display bug
User dropdowns display bug fix
Merge branch 'displayBugFix'

Conflicts:
	app/models/admin_user.rb