Merge.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
Fix of character collision with plane.