changes before kulturnat 2013
obscura stuff merge