Added <base> tag to header.php so links to assets work properly
Continuing work hooking up templates to database
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	wp-content/themes/mfadt14/single-project.php
Added projects to database, associated students and projects, changed db structure. Continued hooking up templates to database
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	wp-content/themes/mfadt14/single-project.php
Create a student detail page and have it redirect to the project detail page
Merge remote-tracking branch 'upstream/develop' into develop
Removed old CVS importer, added batch user import plugin AMU, new sql files
Added user accounts for all students and associated with student/project posts, and remove htaccess from gitignore
Removed category/tag boxes for students, and removed image fields for projects & students for now
Updating db content from public dev server
Quincy and Kamilla on student/project page
Quincy and Kamilla on student/project page
test
Merge remote-tracking branch 'upstream/develop' into develop
Fixed wrong address for WP site/home in local dev environments
Merging changes from K & Q CSS branch, edits to header and project detail
Merge branch 'develop-q-and-k-make-css' into develop
Merge branch 'develop'
Add fields for images, video and thumbnail, added plugin to change order of custom field groups, and changed title of featured image meta box to thumbnail