change language
Merge branch 'origin/master'
Add language
Merge branch 'origin/master'
Add Label from database
Merge branch 'origin/master'

Conflicts:
	rosaplanters.com/application/modules/default/views/scripts/cate/slice.phtml