City budget allows 2% raises for staff