Merge branch 'develop' into codeviewer-master
Merge branch 'develop' into playereditor-master
Merge branch 'develop' into codeviewer-master
Merge branch 'develop' into playereditor-master
Update canvaswrapper
List of valid functions added to Canvasrenderer

Although not used anywhere, yet.
Modified executeTimestep slightly, and made the code a bit easier to read.
Also added *.db to gitignore
Merge branch 'playereditor-master' of https://github.com/HGustavs/LenaSYS_2014 into playereditor-master
Merge branch 'develop' into codeviewer-master
Have created a css file and changed button images.
Merge branch 'develop' into playereditor-master
Merge branch 'playereditor-master' of https://github.com/HGustavs/LenaSYS_2014 into playereditor-master

Conflicts:
	PlayerEditor/Consolerenderer/Consolerenderer.html
Added more images
Valid function check

Canvasrenderer will now only run valid functions from XML, i.e.
specified in the list of valid functions.
Merge branch 'playereditor-master' of https://github.com/HGustavs/LenaSYS_2014 into playereditor-master
canvas state functions add to canvasrenderer

canvas state functions add to canvasrenderer
Canvasrenderer fix

fixed name in canvas state function.
update for canvas
General settings menu

A menu for general settings has been implemented.
a few bug fixes

A few bug fixes after fridays big merge.