Changed initial data
Updated camera
Merge branch 'develop' of github.com:ToxicWar/SoShare into develop

Conflicts:
	camera.html
Merge branch 'develop' of github.com:ToxicWar/SoShare into develop
Updated initial data