Merge pull request #56 from ellemot/development

Updates
committing email input changes
what did I change?
Merge pull request #57 from ellemot/LandingPageOne

Landing page one
Merge pull request #58 from ellemot/development

Migrating Lee's Styling Changes
Merge branch 'master' into hotfix-102314

Conflicts:
	application/views/footer.php
	theme2/css/main.css