pulled and synchronized changes
up to date
Merge branch 'master' of https://github.com/elim2g/GreenstorM.git

Conflicts:
	build/PaperMiner.war
removed duplicated code in pm.js
merged with existing workspace
integrated advanced search functionaility for multiple zones
Issues:
	year show/hide broken - rewrite for checkbox instead of combo
	pagination too small
merge with repo
merge with repo
Merge branch 'master' of https://github.com/elim2g/GreenstorM.git

Conflicts:
	WebContent/js/pm.js
	build/PaperMiner.war
	build/war/WEB-INF/dat/new-query-pane.txt
	build/war/js/pm.js
	dat/new-query-pane.txt
latest merge of Rob, Josh and Brendan's code
progressive update of all members merged files
Include GitIgnore
removed build files from git to prevent conflict issues - Josh
Selenium scripts
Add selinium libraries
.
hope this doesnt screw anything up

Merge branch 'master' of https://github.com/elim2g/GreenstorM.git

Conflicts:
	WebContent/js/pm.js
	build/PaperMiner.war
	build/war/js/pm.js
	src/tests/SeleniumTest.java