Set IP addresses
Set aa.ExchangeBean.java to aa.Mach2ExchangeBean.java
Merge origin/master