Fixed bug in bill form
precompiled assets
fixed merge
fixed database.yml test env