Code cleanup and some warnings fixed.

Code cleanup and some warnings fixed.
Issue #33 in AddFromTemplateCommand was fixed.

Inserting of a bucketable item into a bucket does not switches content
language now.