Joined with development branch (inoffically)

F*** branches, I'm too dumb for merging branches. Just pasted the
development source into the master branch now..