more updates
view changes
Merge branch 'master' of https://github.com/zeevmoney/JavaProject-ZL