update bug found in advanced search by article type and by year
Synchronised with repo
Synchronised with repo
Complete S01 - Limit Search Results (still requires user testing)
Added raw result pagination
Test
Test
Test
Merge branch 'master' of https://github.com/elim2g/GreenstorM.git

Conflicts:
	WebContent/js/pm.js
	build/PaperMiner.war
	build/war/js/pm.js
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
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