Merge pull request #26 from Joomla-Bible-Study/master

update from master
fixing up the Ordering Helper for the site so don't have to copy the Jui over form Joomla3.0
Merge remote-tracking branch 'origin/features' into features
Fixing up the Member view. still needs lots of work.
fix \n
working on some meager fixes to the code.
Merge remote-tracking branch 'origin/features' into features

Conflicts:
	admin/controller.php
Got most of the views on the admin side working right. The geostatus is still not finished. needs some more debugging.
formatting
Merge remote-tracking branch 'origin/features' into features
Still working up the new Update geoupdate form the geostatus page. Will need to make it work off a lightbox popup.
Fixed the JModulList and GeoStatus plus GeoUpdate
Adding in JUI and removing old branches.
Adding fof.
Adding in the fof install
Merge branch 'features' of https://github.com/Joomla-Bible-Study/joomla_churchdirectory into features
change to \n
New Jui
Fixed some new edits and reworked the colorpicker. also removed FOF not using it yet. still lot to look into on the fof.
Adding Jui local