2d type
Interface 3d variant
Calculating
Really add files
Merge branch 'interface_3d_version'

Conflicts:
	client/templates/main/main.html.jade