Recreate #14, ft to new names.
Merge branch '14-new' of github.com:shushu/mobile4social_demo into 14-new

Conflicts:
	mobile4social_demo/modules/drupal_of_things/thing/plugins/contexts/thing.inc