Get language from database
Add upload admin category
Merge branch 'origin/master'

Conflicts:
	application/modules/default/languages/du/general.ini
	application/modules/default/languages/fr/general.ini
	application/modules/default/languages/ge/general.ini
	application/modules/default/languages/sp/general.ini
Merge branch 'origin/master'

Conflicts:
	application/modules/default/languages/du/general.ini
	application/modules/default/languages/fr/general.ini
	application/modules/default/languages/ge/general.ini
	application/modules/default/languages/sp/general.ini