Big merge (never do this again!)
123
Fix bjyauthorize
Add Authorization module
Configure bjyauthorize for Admin-Module
Configure bjyauthorize for Category-Module
Remove admin.phtml from Authorization module
Configure bjyauthorize for Subject-Module
Configure bjyauthorize for File-Module