Merge origin/master

Conflicts:
	component/admin/config.xml
	component/admin/language/en-GB.com_jevents.ini
	component/site/jevents.php
Fixed issue #244
Merge origin/master
Merge commit '6c8be4e0df073cf53dc7a8f348d606f2c0b09afd' into jQuery

Conflicts:
	component/admin/config.xml
	component/site/jevents.php
Merge commit '515038f4c3291bc6d676fde8950a7c79fb6c4ffd' into jQuery
Bootstrap modal to only be called if element is on the page
Bootstrap methods to only be called if element is on the page