change to \n
Merge pull request #30 from Joomla-Bible-Study/features

Moving Alpha Branch to Master
breing over form feature
Merge remote-tracking branch 'origin/master'

Conflicts:
	admin/elements/churchdirectory.php
	admin/elements/colorpicker.php
	admin/models/fields/colorpicker.php
	admin/views/info/tmpl/default.php
	admin/views/info/view.html.php
	branches/Old_Component/admin/admin.qcontacts.php
	branches/Old_Component/admin/contact_items.xml
	branches/Old_Component/admin/controller.php
	branches/Old_Component/admin/controllers/contact.php
	branches/Old_Component/admin/controllers/tools.php
	branches/Old_Component/admin/elements/directory.php
	branches/Old_Component/admin/install.nonutf8.sql
	branches/Old_Component/admin/install.qcontacts.php
	branches/Old_Component/admin/models/contact.php
	branches/Old_Component/admin/models/qcontacts.php
	branches/Old_Component/admin/models/tools.php
	branches/Old_Component/admin/qcontacts.xml
	branches/Old_Component/admin/qcontacts_cfg.xml
	branches/Old_Component/admin/views/info/tmpl/default.php
	branches/Old_Component/admin/views/info/view.html.php
	branches/Old_Component/admin/views/tools/tmpl/default.php
	branches/Old_Component/admin/views/tools/view.html.php
	branches/Old_Component/language/admin/en-GB/en-GB.com_qcontacts.ini
	branches/Old_Component/language/admin/en-GB/en-GB.com_qcontacts.menu.ini
	branches/Old_Component/language/site/en-GB/en-GB.com_qcontacts.ini
	branches/Old_Component/site/controller.php
	branches/Old_Component/site/controllers/captcha.php
	branches/Old_Component/site/controllers/vcard.php
	branches/Old_Component/site/css/css-fa376ad956803f9bb5c8ee8d7d286b4f.php
	branches/Old_Component/site/css/qcontacts.css
	branches/Old_Component/site/models/section.php
	branches/Old_Component/site/qcontacts.php
	branches/Old_Component/site/views/category/tmpl/default.xml
	branches/Old_Component/site/views/category/tmpl/default_items.php
	branches/Old_Component/site/views/category/view.feed.php
	branches/Old_Component/site/views/category/view.html.php
	branches/Old_Component/site/views/contact/tmpl/default.xml
	branches/Old_Component/site/views/contact/tmpl/default_confirm.php
	branches/Old_Component/site/views/contact/view.html.php
	branches/Old_Component/site/views/directory/view.feed.php
	branches/Old_Component/site/views/printdirectory/view.feed.php
	branches/Old_Component/site/views/section/metadata.xml
	branches/Old_Component/site/views/section/tmpl/default.php
	branches/Old_Component/site/views/section/tmpl/default.xml
	branches/Old_Component/site/views/section/view.html.php
	changelog.php
	churchdirectory.script.php
	media/css/churchdirectory.css
fix form-vertical and add spouse rendering from DB.
fixed some rendering errors and remove the filed as a input box do to it will overweight the content in the db.
Remove modal.php that are not needed.
Fix some look and views
Fixing some language Strings
Fixing coding standers and other things
Adding batch html
Fixed some css and layouts.
Revert "Fixed some css and layouts."

This reverts commit 1fcfe3c098b1b3f128743afb13c0c1a6d11c58d5.
Pushed css clean up.
Fixed a lot of contact to member naming.
Fixed batch files with new css
Fixed a naming of the menu for j2.5
fixed geoupdate and geostatus.
Fix Featured
GeoUpdate fix.