Added preview to Chart dashlet
Added new event configuration for more Foundry Traps found while
working at customer site.
Merging configuration to include new Foundry Event configuration file.

Merge branch 'master' of github.com:OpenNMS/opennms
wait for the surveillance view to finish loading
Merge remote-tracking branch 'opennms/1.12'
Adding some initialization improvements.
Fixing a typo error on SystemDefPanel
fix permissions on assemblies
<file> does not get directoryMode
Clean up POMs, make sure we're using ECJ for JSPs.
Merge remote-tracking branch 'opennms/1.12'

Conflicts:
	pom.xml
skip this test in 1.12, it flaps, and is fixed in master
Merge remote-tracking branch 'opennms/1.12'

Conflicts:
	opennms-provision/opennms-provisiond/src/test/java/org/opennms/netmgt/provision/service/ProvisionerTest.java
update all vmware icons
Merge branch 'master' of github.com:OpenNMS/opennms
Adding some validations required by Vaddin 7 but not by Vaddin 6 ;)
fix ordering issues in FoundryNetworks2.events.xml
added support for radial chart in topo map
SPC-674 fix race condition in requisitions
Merge branch '1.12'

Conflicts:
	opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/RequisitionFileUtils.java