Merge from popkirby, ajaxtize beatech_master