fte-300
fte-311
Merge branch 'master' of https://github.com/qiang2liu/drupal_dev_demo

Conflicts:
	sites/all/modules/custom/themuraly/themuraly.module