adding misc. changes to projRev[master]
fixed conflict in projRev[master]