Merge pull request #12 from dwise006/kwals010-master

Kwals010 master
Main nav changes

Switched ICON for campaigns and content.
Renamed content to Emails on nav and in tile section.
Fixed table format and color for campaign tiles.
Merge branch 'master' of https://github.com/dwise006/EmViNewest
Merge pull request #1 from dwise006/master

to get david's changes
Added emailpreview.php and function to support it in emailclass.php.

David, I also put the uploaded file location in the siteConfig table and
updated config/general.php
removed extraneous files from /emvi/content
fixed path for DB_Class
Merge pull request #13 from kwals010/master

Here's the preview function
Changed Home to Work in the nav
manual merge of email from keith
Manual merge of files through command
Merge branch 'master' of https://github.com/dwise006/EmViNewest
Merge pull request #14 from kwals010/master

Changed Home to Work in the nav
site config and email send

Added a site config for content URL
added the ability to send to individual email or all emails assigned to
a campaign to the currently logged on user.
Merge pull request #2 from dwise006/master

looks like some of these changes are mine