new contact page & functionality
Merge branch 'master' into contact-page

Conflicts:
	assets/admin/layout/css/custom.css
Merge pull request #52 from stoopkid1/contact-page

New contact page & functionality