asus 20140422
Merge branch '20140321-PCSVR' of https://github.com/newmann/footstone into 20140321-PCSVR

Conflicts:
	source/Application/Footstone/View/default/Index/Index.html