doctrine using1
Merge branch 'master' of https://github.com/cnpisit/Ankor.people

Conflicts:
	composer.phar
database/album300413.sql