Merge remote-tracking branch 'or/master'

Conflicts:
	.gitignore
Working on the field order in the species_detail template.
Merge remote-tracking branch 'or/master'

Conflicts:
	.gitignore
Added ImageField
Updates for the pics import procedure.
To operate the pic files imprt -

place the files in c:\work\orig_pics,
and run python manage.py import_pics_files

Next step - doing thumbnails.
- Species COL remove

- Import file update
Col removal
Merge remote-tracking branch 'origin/master'
Added South
Temp Commit -

Things to be done -
1. Finish the image localfile at species_detail,
2. Change the media folder to static.
3. change csv files reading.
4. fix the full_path func.
tmp2
Merge remote-tracking branch 'or/master'

Conflicts:
	pages/templates/pages/species_detail.html
	redspecies/settings.py
tmp -

working on importing in one file,
Genus,
and FKeys.
All input and migrations - work,

I'll add some user interface and documentation later on.
- All input working =  manage.py all_imports

- Added primary_image field to the images
 - uplodading the DB itself to save running time
fixed link of search in the nav-bar
fixed search function in views.py
Merge commit 'f5ba70c0e407ee3b9a57990e5479b760725d6be2'

Conflicts:
	pages/models.py
	pages/templates/pages/species_detail.html
	redspecies/settings.py
fixed files after merge