9/12/2014 15:18
Merge branch 'master' of https://github.com/Arashage/Phoenix14.4

Conflicts:
	Phoenix14.4/src/main/java/Applib/Applib_ArrivalNotices.java
	Phoenix14.4/src/main/java/Objectrepository/OR_ArrivalNotice.java
9/12/2014  15:28
Merge branch 'master' of https://github.com/Arashage/Phoenix14.4