fixed regex from jm
added COMM to popout screen
added missing file
Merge branch 'master' into awosInAfd

Conflicts:
	src/com/ds/avare/TypeValueAdapter.java
	src/com/ds/avare/place/Awos.java
Updated telephone regex