Update pom.xml
Update pom.xml
Update pom.xml
Update pom.xml
Update pom.xml
Update pom.xml
Adjust to core console 1.5.4.Final
Add app/overlays to .gitignore
Resolve merge conflict for PR #22: https://github.com/teiid/teiid-web-console/pull/22
Merge pull request #23 from hpehl/1.1.x

Core console 1.5.x
Removed SNAPSHOT from version and change the parent so that it aligns with the new BOM's
Merge pull request #24 from vhalbert/1.1.x

Removed SNAPSHOT from version and change the parent to align with BOM
Bump to HAL 2.2.3.Final
Merge pull request #25 from hpehl/hal-2.x

Bump to HAL 2.2.3.Final
Merge branch '1.1.x' of https://github.com/rareddy/teiid-web-console into rareddy-1.1.x

Conflicts:
	app/pom.xml
	dist/pom.xml
	gui/pom.xml
	pom.xml
Merge branch 'master' of git://github.com/teiid/teiid-web-console

Conflicts:
	gui/src/main/java/org/jboss/as/console/client/teiid/Extension.java
	gui/src/main/java/org/jboss/as/console/client/teiid/ExtensionBinding.java
	gui/src/main/java/org/jboss/as/console/client/teiid/runtime/VDBPresenter.java