trying to stop bots
added administration to admin dropdown
Merge branch 'master' into 3.1
merged branches
updated controller information
updated helper information
updated models information