Test push from Eli
removing test commit edits to README.md
passing img file to js
passing param to js file
removed unnecessary packages
fixing merge conflicts
Cleaned up templates. Implemented movement controls for 3D scene. Images may be displayed in the WEbGL view? WIP. Difficult to tell on my Linux machine.
Merge branch 'master' into development

Conflicts:
	ArchBase/__init__.pyc
	ArchBase/settings.pyc
	ArchBase/urls.pyc
	ArchBase/wsgi.pyc
	db.sqlite3
	profiles/__init__.pyc
	profiles/admin.pyc
	profiles/models.pyc
	profiles/urls.pyc
	profiles/views.pyc
	projects/__init__.pyc
	projects/admin.pyc
	projects/forms.pyc
	projects/models.pyc
	projects/urls.pyc
	projects/views.pyc
	search/__init__.pyc
	search/urls.pyc
	search/views.pyc