Adding ufs obj type.
Merging issue fixing codes.
Merge branch 'dev_richard_20140517_adding_ufs_obj_type'

Conflicts:
	libs/webmanager/django_commands_dict.py