Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Removed helper zip file
Merge remote-tracking branch 'upstream/master'
loadArray is deprecated and should be replaced with loadColumn. Joomla! 2.5.7 supports loadColumn so we can safely remove loadArray.
-------------------
Merge remote-tracking branch 'upstream/jQuery' into jQuery

Conflicts:
	component/admin/language/en-GB.com_jevents.ini
	plugins/jevents/jevents.php
Fixed issue when saving categories. Was always searching for events and not checking the published state.
Updated categoryChangeState parameters to only apply to Archive and Trashed.
Added extra call to the defines file within the helper file, fixes when the pop-up event detail plugin is enabled.
Fixed logic in IF statements.
Merge pull request #246 from xtech86/master

Content Plugin Fixes
Set month and yeat vars in event detail view for calendar module to use if needed
JEvents 3.1.34 release
Merge commit '64d1a2f8a5abb8c97bd7885be933b2fbcff45dc1' into jQuery

Conflicts:
	install.php
	modules/mod_jevents_switchview/mod_jevents_switchview.xml
version 3.2.1