init commit
Merge branch 'master' of https://github.com/yaupingyee/drupal7.aegir.keithyau.com