#FTE-276
#FTE-244
@TODO popup login/register
Merge branch 'master' of https://github.com/qiang2liu/drupal_dev_demo