Library Update
add TetrisBook
Add Libarz Update to master
Add Tetris Book Texture
Merge remote-tracking branch 'origin/Light-Man-Branch'
Merge remote-tracking branch 'origin/master'

Conflicts:
	Ismar_BaseProject/Assets/Jake Script/Translate.cs
	Ismar_BaseProject/Assets/Library.unity
changes stuff in libarz scene
Changes to Lightman

Missing floor texture
Merge remote-tracking branch 'origin/Force-game' into Force-game

Conflicts:
	Ismar_BaseProject/Assets/Prefabs/Wall.prefab
	Ismar_BaseProject/Assets/Scenes/ForceGame.unity
Update
Wall change

Walls are invisible to make sure user doesnt leave the marker. Game
should be good to work.
IntroScreenAdded
No changes, checked the correct marker is in place
Merge remote-tracking branch 'origin/Light-Man-Branch' into AndroidApplication

Conflicts:
	Ismar_BaseProject/Assets/Editor/QCAR/ImageTargetTextures/ISMAR.meta
	Ismar_BaseProject/Assets/Editor/QCAR/ImageTargetTextures/ISMAR/ISMAR1_scaled.jpg.meta
	Ismar_BaseProject/Assets/Graphics/Meshes/Materials/Materials.meta
	Ismar_BaseProject/Assets/MEISTERS.TTF.meta
	Ismar_BaseProject/Assets/Materials.meta
	Ismar_BaseProject/Assets/Scenes/Empty.unity
	Ismar_BaseProject/Assets/StreamingAssets/QCAR/ISMAR.dat
	Ismar_BaseProject/Assets/StreamingAssets/QCAR/ISMAR.xml
	Ismar_BaseProject/Assets/StreamingAssets/QCAR/ISMAR.xml.meta
	Ismar_BaseProject/ProjectSettings/EditorBuildSettings.asset
	Ismar_BaseProject/ProjectSettings/ProjectSettings.asset