first commit
Remove duplicated directory
updated folder
Merge branch 'master' of https://github.com/qcccs/PhpPalette

Conflicts:
	PHPsourcefilepalette/build/classes/org/netbeans/modules/filepalette/Bundle.properties
	PHPsourcefilepalette/build/classes/org/netbeans/modules/filepalette/Echo.xml
	PHPsourcefilepalette/build/classes/org/netbeans/modules/filepalette/items/resources/Bundle.properties
	PHPsourcefilepalette/build/classes/org/netbeans/modules/filepalette/items/resources/PHPVariableNameComboModel.class
	PHPsourcefilepalette/build/classes/org/netbeans/modules/filepalette/layer.xml
	PHPsourcefilepalette/build/cluster/modules/edu-mass-qcc-palette.jar
	PHPsourcefilepalette/build/cluster/update_tracking/edu-mass-qcc-palette.xml
	PHPsourcefilepalette/build/depcache/dependencies.txt
	PHPsourcefilepalette/build/testuserdir/config/Preferences/org/netbeans/modules/autoupdate.properties
	PHPsourcefilepalette/build/testuserdir/config/Preferences/org/netbeans/modules/autoupdate/ui.properties
	PHPsourcefilepalette/build/testuserdir/config/Preferences/org/netbeans/modules/tasklist/ui.properties
	PHPsourcefilepalette/build/testuserdir/config/Preferences/org/netbeans/modules/uihandler.properties
	PHPsourcefilepalette/build/testuserdir/config/Preferences/org/netbeans/spi/palette/CommonPaletteSettings/learningpalette.properties
	PHPsourcefilepalette/build/testuserdir/config/Windows2Local/Components/MultiView-php#002Esource#007Ctext#002Ehistory#007C.settings
	PHPsourcefilepalette/build/testuserdir/config/Windows2Local/WindowManager.wswmgr
	PHPsourcefilepalette/build/testuserdir/config/org-netbeans-api-project-libraries/libraries-timestamps.properties
	PHPsourcefilepalette/build/testuserdir/lock
	PHPsourcefilepalette/build/testuserdir/var/cache/all-files.dat
	PHPsourcefilepalette/build/testuserdir/var/cache/all-installer.dat
	PHPsourcefilepalette/build/testuserdir/var/cache/all-layers.dat
	PHPsourcefilepalette/build/testuserdir/var/cache/all-manifests.dat
	PHPsourcefilepalette/build/testuserdir/var/cache/all-modules.dat
	PHPsourcefilepalette/build/testuserdir/var/cache/all-resources.dat
	PHPsourcefilepalette/build/testuserdir/var/cache/catalogcache/pluginportal-update-provider
	PHPsourcefilepalette/build/testuserdir/var/cache/index/last-known-CustomIndexerFactory.properties
	PHPsourcefilepalette/build/testuserdir/var/cache/index/last-known-EmbeddingIndexerFactory.properties
	PHPsourcefilepalette/build/testuserdir/var/cache/index/s17/TaskListIndexer/2/1/segments.gen
	PHPsourcefilepalette/build/testuserdir/var/cache/index/s17/javascript/8/1/segments.gen
	PHPsourcefilepalette/build/testuserdir/var/cache/index/s17/org-netbeans-modules-jumpto-file-FileIndexer/1/1/segments.gen
	PHPsourcefilepalette/build/testuserdir/var/cache/index/s23/errors/1/index.php.err
	PHPsourcefilepalette/build/testuserdir/var/cache/index/s23/org-netbeans-modules-jumpto-file-FileIndexer/1/1/segments.gen
	PHPsourcefilepalette/build/testuserdir/var/cache/index/s23/php/21/1/segments.gen
	PHPsourcefilepalette/build/testuserdir/var/cache/index/s23/timestamps.properties
	PHPsourcefilepalette/build/testuserdir/var/cache/lastModified/all-checksum.txt
	PHPsourcefilepalette/build/testuserdir/var/cache/localeVariants
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso-bundles
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/.bundledata.1
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/.lazy.1
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/.manager/.fileTable.4
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/.manager/.fileTable.5
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/.state.1
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/1/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/10/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/100/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/101/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/102/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/103/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/104/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/106/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/107/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/108/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/109/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/11/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/111/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/112/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/113/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/114/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/116/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/118/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/12/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/120/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/121/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/123/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/124/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/125/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/126/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/127/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/128/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/129/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/13/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/130/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/132/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/133/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/134/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/136/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/137/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/138/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/139/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/14/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/140/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/142/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/143/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/145/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/146/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/147/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/148/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/15/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/150/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/153/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/154/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/155/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/156/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/158/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/16/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/160/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/161/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/162/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/163/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/164/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/165/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/166/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/167/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/17/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/171/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/172/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/173/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/175/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/176/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/177/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/178/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/179/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/18/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/182/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/183/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/184/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/185/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/186/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/187/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/188/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/19/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/20/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/21/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/22/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/23/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/24/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/26/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/27/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/28/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/3/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/30/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/31/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/34/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/35/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/37/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/38/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/39/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/4/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/40/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/43/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/45/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/46/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/47/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/48/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/5/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/50/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/51/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/52/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/53/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/54/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/55/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/57/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/58/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/60/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/61/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/62/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/63/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/64/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/65/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/66/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/67/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/69/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/7/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/71/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/72/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/73/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/74/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/76/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/78/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/79/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/81/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/82/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/84/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/87/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/9/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/90/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/91/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/92/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/93/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/94/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/95/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/cache/netigso/org.eclipse.osgi/bundles/96/1/bundlefile
	PHPsourcefilepalette/build/testuserdir/var/filehistory/77/d5cdb856cd4c67809e465f1a38606fa9/data
	PHPsourcefilepalette/build/testuserdir/var/filehistory/95/29458010f3448b66149c11427a643cef/data
	PHPsourcefilepalette/build/testuserdir/var/log/messages.log
	PHPsourcefilepalette/build/testuserdir/var/log/messages.log.1
	PHPsourcefilepalette/build/testuserdir/var/log/messages.log.2
	PHPsourcefilepalette/build/testuserdir/var/log/uigestures
	PHPsourcefilepalette/build/testuserdir/var/log/uigestures.1
	PHPsourcefilepalette/src/org/netbeans/modules/filepalette/Bundle.properties
	PHPsourcefilepalette/src/org/netbeans/modules/filepalette/Echo.xml
	PHPsourcefilepalette/src/org/netbeans/modules/filepalette/items/resources/Bundle.properties
	PHPsourcefilepalette/src/org/netbeans/modules/filepalette/items/resources/PHPVariableNameComboModel.java
	PHPsourcefilepalette/src/org/netbeans/modules/filepalette/layer.xml
	README