#Fix menu link by l() function. Because my development on Subdirectories
Merge branch 'master' of https://github.com/qiang2liu/drupal_dev_demo
#FTE-108 Add stage module; \n 1. Add stage list/create/edit page; 2. Add manage box form,no finish; 3. Add config of stage term settings to get edgemakers_set type;
Merge branch 'master' of https://github.com/qiang2liu/drupal_dev_demo

Conflicts:
	sites/all/themes/fte/templates/page.tpl.php