db_password
Merge branch 'master' of https://github.com/jangseunghun/flightbook

Conflicts:
	config/db.php
	server.php