BIG MERGE 12/17/13
Merge remote-tracking branch 'upstream/master'

Conflicts:
	plugins/plg_prospector/prospect_view_lists.php
	test.php
Merge pull request #101 from alexsimon1234/master

Big merge 12/17/13