Signed-off-by: JacobCorle <jacobcorle@gmail.com>
Merge branch 'dev' of git@github.com:danielkinjerski/GameJame2013_Sept.git into dev

Conflicts:
	GameJam/Assets/Models/Materials/DefaultMat.mat.meta
	GameJam/Assets/Models/Texture.meta
	GameJam/Assets/Models/Texture/cd4_normals.TGA.meta
	GameJam/Assets/Models/cd4celllow.obj.meta
	GameJam/Assets/NGUI/Examples/Atlases/Fantasy/Fantasy Atlas.prefab
	GameJam/Assets/NGUI/Examples/Atlases/SciFi/SciFi Atlas.prefab
	GameJam/Assets/NGUI/Examples/Atlases/SciFi/SciFi Font - Normal.prefab
	GameJam/Assets/NGUI/Examples/Atlases/Wooden/Wooden Atlas.prefab
	GameJam/Assets/NGUI/Examples/Other/Storage Icon Template.prefab
	GameJam/Assets/NGUI/Examples/Scenes/Example 1 - UIAnchor.unity
	GameJam/Assets/NGUI/Examples/Scenes/Example 10 - Localization.unity
	GameJam/Assets/NGUI/Examples/Scenes/Example 11 - Drag & Drop.unity
	GameJam/Assets/NGUI/Examples/Scenes/Example 12 - Chat Window.unity
	GameJam/Assets/NGUI/Examples/Scenes/Example 13 - Tabs.unity
	GameJam/Assets/NGUI/Examples/Scenes/Example 2 - Interaction.unity
	GameJam/Assets/NGUI/Examples/Scenes/Example 3 - Menu.unity
	GameJam/Assets/NGUI/Examples/Scenes/Example 4 - Controller Input.unity
	GameJam/Assets/NGUI/Examples/Scenes/Example 5 - Lights and Refraction.unity
	GameJam/Assets/NGUI/Examples/Scenes/Example 6 - Draggable Window.unity
	GameJam/Assets/NGUI/Examples/Scenes/Example 7 - Scroll View (Panel).unity
	GameJam/Assets/NGUI/Examples/Scenes/Example 8 - Scroll View (Camera).unity
	GameJam/Assets/NGUI/Examples/Scenes/Example 9 - Quest Log.unity
	GameJam/Assets/NGUI/Examples/Scenes/Example X - Character.unity
	GameJam/Assets/NGUI/Examples/Scenes/Tutorial 1 - Scene.unity
	GameJam/Assets/NGUI/Examples/Scenes/Tutorial 10 - 3D.unity
	GameJam/Assets/NGUI/Examples/Scenes/Tutorial 11 - Popup List.unity
	GameJam/Assets/NGUI/Examples/Scenes/Tutorial 2 - Sprite.unity
	GameJam/Assets/NGUI/Examples/Scenes/Tutorial 3 - Sliced Sprite.unity
	GameJam/Assets/NGUI/Examples/Scenes/Tutorial 4 - Tiled Sprite.unity
	GameJam/Assets/NGUI/Examples/Scenes/Tutorial 5 - Label.unity
	GameJam/Assets/NGUI/Examples/Scenes/Tutorial 6 - Button.unity
	GameJam/Assets/NGUI/Examples/Scenes/Tutorial 7 - Slider.unity
	GameJam/Assets/NGUI/Examples/Scenes/Tutorial 8 - Checkbox.unity
	GameJam/Assets/NGUI/Examples/Scenes/Tutorial 9 - Input.unity
	GameJam/Assets/NGUI/Examples/Scenes/Tutorial X - Video.unity
	GameJam/Assets/Script/Player/PlayerControl.cs
	GameJam/Assets/Texture/backgroundidea1.png.meta