Added model multiple file and folder upload.
Updated sidebar with images and data models.
Step merge commit.
More merge fixes.
Merge branch 'master' into data_model

Conflicts:
	app/db_api.py
	app/views.py
Merge pull request #51 from brittainhard/data_model

Data model changes