update pokemon db
added pokemon select template and bag db
fixed conflict