FUCKING HELL

Tering conflicts.
Merge branch 'master' of https://github.com/boersmamarcel/neptune

Conflicts:
	neptune/src/test/sample/context/basicexpression.npt.as
	neptune/src/test/sample/context/codeblock.npt.as
	neptune/src/test/sample/context/codeblock.npt.obj
	neptune/src/test/sample/context/incorrect_variable_assignment.npt.as
	neptune/src/test/sample/correct/foreach.npt.as
	neptune/src/test/sample/correct/foreach.npt.obj
	neptune/src/test/sample/correct/foreach.npt.out
Merge branch 'master' of https://github.com/boersmamarcel/neptune