Users.php : Add annotation
module.config.php : namespace
database default config
Merge branch 'master' of github.com:cnpisit/Ankor.people

Conflicts:
	module/Album/config/module.config.php