o0
Merge branch 'master' of https://github.com/marajin/HypatiaStation

Conflicts:
	.gitignore
Resynced all the code with Bay as of 8th march 2014.

It compiles but I still need to merge .dmi differences, repair airlocks, work out why player panels are broken for things like Xenos (probably to do with the new DNA2 system), etc. This is very beta code.