2014/12/27 Hare Update fix bug
Merge branch 'master' of https://github.com/Hare8563/LostPrincess

Conflicts:
	Library/assetDatabase3
	Library/guidmapper