background of enter menu
Merge branch 'dev' into background
t i
Bring up to date with dev branch; and cleanup
Add Score-gui
Merge branch 'background' of https://github.com/hermanbanken/LightRailGame into background

Conflicts:
	Dummy/Assembly-CSharp-vs.csproj
	Dummy/Assembly-CSharp.csproj
	Dummy/Assets/Scene.unity
Play/Pause buttons
Temp commit
Merge branch 'dev' into background

Conflicts:
	Dummy/Assembly-CSharp-vs.csproj
	Dummy/Assembly-CSharp.csproj
	Dummy/Assets/Enterpage/Icons(main page)/ranking.png.meta
	Dummy/Assets/GUIs.cs
	Dummy/Assets/Obstacle.cs
	Dummy/Assets/ObstacleMaster.cs
	Dummy/Assets/Scene.unity
	Dummy/Assets/Start.unity
	Dummy/Assets/Train.cs
Basic scoring
Fix pausing of Obstacle resolving (Time.time instead of DateTime.now)
Added OKButton
Merge branch 'background' into dev

Conflicts:
	Dummy/Assembly-CSharp-vs.csproj
	Dummy/Assembly-CSharp.csproj
	Dummy/Assets/Obstacle.cs
update paths to Unity 4.6.1
Fix DateTime -> float?