Add contains(), concat().
added string() function
Merge branch 'master' of github.com:retnuh/mochiweb_xpath

Conflicts:
	test/mochiweb_xpath_tests.erl
remove debug output
Merge branch 'master' of git://github.com/noblesamurai/mochiweb_xpath into noblesamurai-master

Conflicts:
	src/mochiweb_xpath_functions.erl
Merge branch 'master' of github.com:seriyps/mochiweb_xpath into seriyps-master

Conflicts:
	src/mochiweb_xpath_functions.erl
	test/html-docs/test1.html
fixup tests after merge
bump version to 1.2.0