updating poms for 2.0.4-SNAPSHOT development
updating develop poms to master versions to avoid merge conflicts
Merge branch 'master' into develop
Updating develop poms back to pre merge state
Update pom.xml
upgraded to as-util 2.0.2
updating poms for branch'release/2.0.4' with non-snapshot versions
Merge branch 'release/2.0.4'

Conflicts:
	pom.xml