Re-Commiting everything I had

Putting everything I had back into the right place.
Updated NGUI
Merge branch 'Marks'
I have Put in the inventory system into scene 1
Ngui Examples
Merge branch 'Mark'
Quest Log now sort of working

Images on Trello
Quest Log now sort of working

Images on trello
[Dialogue] Put in BC's dialogues for shackles and wes in the first scene.
Flickering Lights scene and script made
New UI (Thanks Jeremy) More window mechanics

A new UI has been implemented thanks to our fantastic artist, Jeremy. A
close button has been added and now when the log is closed it will be
opened by the quest tracker labels.
Merge branch 'Mark'
Improved Code a bit

Uuughh I had some git problems
Merge branch Rock
Readded EditorBuildSettings

Git screwed me up a bit, nothing to worry about though
added Fbx character files back in
Merge remote-tracking branch 'origin/master'

Conflicts:

	Assets/Models/maleCharacter_animationTree/Materials/maleMain_diff_1k.mat

	Assets/Models/maleCharacter_animationTree/Materials/maleMain_diff_1k.mat.meta
artchanges
Updated fbx
Set anchors on the guy in scene 1