Added config option to select where to redirect to after canceling when editing an event.
Wrapped jev_pretoolbar in a classed div, currently with no CSS applied to the layouts to allow styling.
Wrapped jev_pretoolbar in a classed div, currently with no CSS applied to the layouts to allow styling.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	component/admin/language/en-GB.com_jevents.ini
Added in missing override field for iCal export
Fixed strict standards trying to pass by reference.
Fixing typo
Merge pull request #235 from carcam/languagefixes

Fixing typo
Merge pull request #232 from xtech86/master

Wrapped jevpretoolbar, added missing override field and added config option on where to redirect when canceling an event.
Merge pull request #231 from xtech86/jQuery

Removed hard coded color and set to inherit. Should be styled per Layout...
RSVP Pro version 3.1.6 : HikaShop Plugin update to allow payment notification messages
Merge commit '4b03bc05c447bb4297924c67e8c3f55c0b8ab00d' into jQuery

Conflicts:
	component/admin/language/en-GB.com_jevents.ini
	component/site/views/icalevent/view.html.php
JEvents 3.2.0
Merge branch 'jQuery' of github.com:JEvents/JEvents into jQuery

Conflicts:
	component/site/views/alternative/icals/tmpl/ical_form.php
	component/site/views/default/icals/tmpl/ical_form.php
	component/site/views/ext/icals/tmpl/ical_form.php
	component/site/views/icals/tmpl/ical.xml
fix for relative loading of bootstrap.js 

Merge branch 'jQuery' of github.com:JEvents/JEvents into jQuery

Conflicts:
	component/site/views/alternative/icals/tmpl/ical_form.php
	component/site/views/default/icals/tmpl/ical_form.php
	component/site/views/ext/icals/tmpl/ical_form.php
	component/site/views/icals/tmpl/ical.xml
Move modules folder back to correct location !!!
Updated function in Helper file to avoid fatal error, added in new Plugin, added new language strings, and updated install routine/package file for the new plugin.